From 5b0a2bdbdeabfd02923a9998e6e2dafa614b47f3 Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Fri, 12 Jul 2013 02:39:37 +0100 Subject: [PATCH] Fix formatting badness. --- src/class-output.lisp | 126 +++++++++++++++++++++++++++----------------------- 1 file changed, 67 insertions(+), 59 deletions(-) diff --git a/src/class-output.lisp b/src/class-output.lisp index 58d4830..b168d89 100644 --- a/src/class-output.lisp +++ b/src/class-output.lisp @@ -28,8 +28,7 @@ ;;;-------------------------------------------------------------------------- ;;; Classes. -(defmethod hook-output progn ((class sod-class) (reason (eql :h)) - sequencer) +(defmethod hook-output progn ((class sod-class) (reason (eql :h)) sequencer) ;; Main output sequencing. (sequence-output (stream sequencer) @@ -121,8 +120,9 @@ ;;;-------------------------------------------------------------------------- ;;; Instance structure. -(defmethod hook-output progn ((slot sod-slot) (reason (eql 'islots)) - sequencer) +(defmethod hook-output progn ((slot sod-slot) + (reason (eql 'islots)) + sequencer) (sequence-output (stream sequencer) (((sod-slot-class slot) :islots :slots) (pprint-logical-block (stream nil :prefix " " :suffix ";") @@ -137,8 +137,7 @@ (dolist (item (ichain-body ichain)) (hook-output item reason sequencer))) -(defmethod hook-output progn ((ilayout ilayout) (reason (eql :h)) - sequencer) +(defmethod hook-output progn ((ilayout ilayout) (reason (eql :h)) sequencer) (with-slots (class ichains) ilayout (sequence-output (stream sequencer) ((class :ilayout :start) @@ -150,8 +149,7 @@ (dolist (ichain ichains) (hook-output ichain 'ilayout sequencer)))) -(defmethod hook-output progn ((ichain ichain) (reason (eql :h)) - sequencer) +(defmethod hook-output progn ((ichain ichain) (reason (eql :h)) sequencer) (with-slots (class chain-head chain-tail) ichain (when (eq class chain-tail) (sequence-output (stream sequencer) @@ -180,8 +178,9 @@ (sod-class-nickname super))) (sod-class-chain chain-tail)))))))) -(defmethod hook-output progn ((ichain ichain) (reason (eql 'ilayout)) - sequencer) +(defmethod hook-output progn ((ichain ichain) + (reason (eql 'ilayout)) + sequencer) (with-slots (class chain-head chain-tail) ichain (sequence-output (stream sequencer) ((class :ilayout :slots) @@ -189,8 +188,9 @@ (ichain-union-tag chain-tail chain-head) (sod-class-nickname chain-head)))))) -(defmethod hook-output progn ((vtptr vtable-pointer) (reason (eql :h)) - sequencer) +(defmethod hook-output progn ((vtptr vtable-pointer) + (reason (eql :h)) + sequencer) (with-slots (class chain-head chain-tail) vtptr (sequence-output (stream sequencer) ((class :ichain chain-head :slots) @@ -201,8 +201,7 @@ (dolist (slot (islots-slots islots)) (hook-output slot reason sequencer))) -(defmethod hook-output progn ((islots islots) (reason (eql :h)) - sequencer) +(defmethod hook-output progn ((islots islots) (reason (eql :h)) sequencer) (with-slots (class subclass slots) islots (sequence-output (stream sequencer) ((subclass :ichain (sod-class-chain-head class) :slots) @@ -217,8 +216,9 @@ (with-slots (body) vtable (dolist (item body) (hook-output item reason sequencer)))) -(defmethod hook-output progn ((method sod-method) (reason (eql :h)) - sequencer) +(defmethod hook-output progn ((method sod-method) + (reason (eql :h)) + sequencer) (with-slots (class) method (sequence-output (stream sequencer) ((class :methods) @@ -228,8 +228,7 @@ (sod-method-function-name method)) (format stream ";~%")))))) -(defmethod hook-output progn ((vtable vtable) (reason (eql :h)) - sequencer) +(defmethod hook-output progn ((vtable vtable) (reason (eql :h)) sequencer) (with-slots (class chain-head chain-tail) vtable (when (eq class chain-tail) (sequence-output (stream sequencer) @@ -250,8 +249,7 @@ (vtable-struct-tag chain-tail chain-head) class (sod-class-nickname chain-head)))))) -(defmethod hook-output progn ((vtmsgs vtmsgs) (reason (eql :h)) - sequencer) +(defmethod hook-output progn ((vtmsgs vtmsgs) (reason (eql :h)) sequencer) (with-slots (class subclass chain-head chain-tail) vtmsgs (sequence-output (stream sequencer) ((subclass :vtable chain-head :slots) @@ -259,8 +257,9 @@ (vtmsgs-struct-tag subclass class) (sod-class-nickname class)))))) -(defmethod hook-output progn ((vtmsgs vtmsgs) (reason (eql 'vtmsgs)) - sequencer) +(defmethod hook-output progn ((vtmsgs vtmsgs) + (reason (eql 'vtmsgs)) + sequencer) (when (vtmsgs-entries vtmsgs) (with-slots (class subclass) vtmsgs (sequence-output (stream sequencer) @@ -285,8 +284,9 @@ (with-slots (method) entry (hook-output method reason sequencer))) -(defmethod hook-output progn ((entry method-entry) (reason (eql 'vtmsgs)) - sequencer) +(defmethod hook-output progn ((entry method-entry) + (reason (eql 'vtmsgs)) + sequencer) (let* ((method (method-entry-effective-method entry)) (message (effective-method-message method)) (class (effective-method-class method)) @@ -298,8 +298,9 @@ (pprint-c-type commented-type stream (sod-message-name message))) (terpri stream))))) -(defmethod hook-output progn ((cptr class-pointer) (reason (eql :h)) - sequencer) +(defmethod hook-output progn ((cptr class-pointer) + (reason (eql :h)) + sequencer) (with-slots (class chain-head metaclass meta-chain-head) cptr (sequence-output (stream sequencer) ((class :vtable chain-head :slots) @@ -309,15 +310,15 @@ (sod-class-nickname meta-chain-head) nil)))))) -(defmethod hook-output progn ((boff base-offset) (reason (eql :h)) - sequencer) +(defmethod hook-output progn ((boff base-offset) (reason (eql :h)) sequencer) (with-slots (class chain-head) boff (sequence-output (stream sequencer) ((class :vtable chain-head :slots) (write-line " size_t _base;" stream))))) -(defmethod hook-output progn ((choff chain-offset) (reason (eql :h)) - sequencer) +(defmethod hook-output progn ((choff chain-offset) + (reason (eql :h)) + sequencer) (with-slots (class chain-head target-head) choff (sequence-output (stream sequencer) ((class :vtable chain-head :slots) @@ -329,8 +330,7 @@ (defvar *instance-class*) -(defmethod hook-output progn ((class sod-class) (reason (eql :c)) - sequencer) +(defmethod hook-output progn ((class sod-class) (reason (eql :c)) sequencer) (sequence-output (stream sequencer) :constraint @@ -362,8 +362,9 @@ const struct ~A ~A__classobj = {~%" ;;;-------------------------------------------------------------------------- ;;; Direct methods. -(defmethod hook-output progn ((method delegating-direct-method) (reason (eql :c)) - sequencer) +(defmethod hook-output progn ((method delegating-direct-method) + (reason (eql :c)) + sequencer) (with-slots (class body) method (unless body (return-from hook-output)) @@ -376,8 +377,9 @@ const struct ~A ~A__classobj = {~%" ((class :direct-method method :end) (format stream "#undef CALL_NEXT_METHOD~%"))))) -(defmethod hook-output progn ((method sod-method) (reason (eql :c)) - sequencer) +(defmethod hook-output progn ((method sod-method) + (reason (eql :c)) + sequencer) (with-slots (class body) method (unless body (return-from hook-output)) @@ -397,7 +399,8 @@ const struct ~A ~A__classobj = {~%" ((class :direct-method method :end) (terpri stream))))) -(defmethod hook-output progn ((method basic-effective-method) (reason (eql :c)) +(defmethod hook-output progn ((method basic-effective-method) + (reason (eql :c)) sequencer) (with-slots (class functions) method (sequence-output (stream sequencer) @@ -408,8 +411,7 @@ const struct ~A ~A__classobj = {~%" ;;;-------------------------------------------------------------------------- ;;; Vtables. -(defmethod hook-output progn ((vtable vtable) (reason (eql :c)) - sequencer) +(defmethod hook-output progn ((vtable vtable) (reason (eql :c)) sequencer) (with-slots (class chain-head chain-tail) vtable (sequence-output (stream sequencer) :constraint ((class :vtables :start) @@ -425,8 +427,9 @@ const struct ~A ~A__classobj = {~%" ((class :vtable chain-head :end) (format stream "};~2%"))))) -(defmethod hook-output progn ((cptr class-pointer) (reason (eql :c)) - sequencer) +(defmethod hook-output progn ((cptr class-pointer) + (reason (eql :c)) + sequencer) (with-slots (class chain-head metaclass meta-chain-head) cptr (sequence-output (stream sequencer) :constraint ((class :vtable chain-head :start) @@ -438,8 +441,7 @@ const struct ~A ~A__classobj = {~%" (sod-class-nickname meta-chain-head) (sod-class-nickname metaclass)))))) -(defmethod hook-output progn ((boff base-offset) (reason (eql :c)) - sequencer) +(defmethod hook-output progn ((boff base-offset) (reason (eql :c)) sequencer) (with-slots (class chain-head) boff (sequence-output (stream sequencer) :constraint ((class :vtable chain-head :start) @@ -450,8 +452,9 @@ const struct ~A ~A__classobj = {~%" (ilayout-struct-tag class) (sod-class-nickname chain-head)))))) -(defmethod hook-output progn ((choff chain-offset) (reason (eql :c)) - sequencer) +(defmethod hook-output progn ((choff chain-offset) + (reason (eql :c)) + sequencer) (with-slots (class chain-head target-head) choff (sequence-output (stream sequencer) :constraint ((class :vtable chain-head :start) @@ -463,8 +466,7 @@ const struct ~A ~A__classobj = {~%" (sod-class-nickname chain-head) (sod-class-nickname target-head)))))) -(defmethod hook-output progn ((vtmsgs vtmsgs) (reason (eql :c)) - sequencer) +(defmethod hook-output progn ((vtmsgs vtmsgs) (reason (eql :c)) sequencer) (with-slots (class subclass chain-head) vtmsgs (sequence-output (stream sequencer) :constraint ((subclass :vtable chain-head :start) @@ -478,8 +480,9 @@ const struct ~A ~A__classobj = {~%" ((subclass :vtable chain-head :vtmsgs class :end) (format stream " },~%"))))) -(defmethod hook-output progn ((entry method-entry) (reason (eql :c)) - sequencer) +(defmethod hook-output progn ((entry method-entry) + (reason (eql :c)) + sequencer) (with-slots (method chain-head chain-tail) entry (let* ((message (effective-method-message method)) (class (effective-method-class method)) @@ -492,8 +495,9 @@ const struct ~A ~A__classobj = {~%" ;;;-------------------------------------------------------------------------- ;;; Filling in the class object. -(defmethod hook-output progn ((ichain ichain) (reason (eql 'class)) - sequencer) +(defmethod hook-output progn ((ichain ichain) + (reason (eql 'class)) + sequencer) (with-slots (class chain-head) ichain (sequence-output (stream sequencer) :constraint ((*instance-class* :object :start) @@ -506,8 +510,9 @@ const struct ~A ~A__classobj = {~%" ((*instance-class* :object chain-head :ichain :end) (format stream " } },~%"))))) -(defmethod hook-output progn ((islots islots) (reason (eql 'class)) - sequencer) +(defmethod hook-output progn ((islots islots) + (reason (eql 'class)) + sequencer) (with-slots (class) islots (let ((chain-head (sod-class-chain-head class))) (sequence-output (stream sequencer) @@ -521,8 +526,9 @@ const struct ~A ~A__classobj = {~%" ((*instance-class* :object class :slots :end) (format stream " },~%")))))) -(defmethod hook-output progn ((vtptr vtable-pointer) (reason (eql 'class)) - sequencer) +(defmethod hook-output progn ((vtptr vtable-pointer) + (reason (eql 'class)) + sequencer) (with-slots (class chain-head chain-tail) vtptr (sequence-output (stream sequencer) :constraint ((*instance-class* :object chain-head :ichain :start) @@ -555,8 +561,9 @@ const struct ~A ~A__classobj = {~%" (:compound (format stream " ~@<{ ~;~A~; },~:>~%" (sod-initializer-value-form init))))))) -(defmethod hook-output progn ((slot sod-class-effective-slot) (reason (eql 'class)) - sequencer) +(defmethod hook-output progn ((slot sod-class-effective-slot) + (reason (eql 'class)) + sequencer) (let ((instance *instance-class*) (func (effective-slot-prepare-function slot))) (when func @@ -564,8 +571,9 @@ const struct ~A ~A__classobj = {~%" ((instance :object :prepare) (funcall func instance stream)))))) -(defmethod hook-output progn ((slot effective-slot) (reason (eql 'class)) - sequencer) +(defmethod hook-output progn ((slot effective-slot) + (reason (eql 'class)) + sequencer) (with-slots (class (dslot slot)) slot (let ((instance *instance-class*) (super (sod-slot-class dslot))) -- 2.11.0