X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/sod/blobdiff_plain/b5911ce8da34bfdd5c4515b44fd2efce7c9c233f..5445420ed4158d4cd7aae4a4bb52f4a4e22ed1a2:/src/module-parse.lisp diff --git a/src/module-parse.lisp b/src/module-parse.lisp index 83828e6..a339682 100644 --- a/src/module-parse.lisp +++ b/src/module-parse.lisp @@ -168,16 +168,16 @@ (define-pluggable-parser module set (scanner pset) (lisp (let ((module-pset (module-pset *module*))) (when pset (pset-map (lambda (prop) - (add-property module-pset - (p-name prop) - (p-value prop) - :type (p-type prop) - :location (p-location prop)) + (add-property + module-pset + (p-name prop) (p-value prop) + :type (p-type prop) + :location (p-location prop)) (setf (p-seenp prop) t)) pset)) (parse (skip-many (:min 0) (error (:ignore-unconsumed t) - (parse-property scanner module-pset) + (parse-property scanner module-pset) (skip-until (:keep-end t) #\, #\;)) #\,)))) #\;)))) @@ -329,8 +329,7 @@ (defun parse-class-body (scanner pset name supers) ;; [`class'] -!- slot-initializer-list `;' ;; ;; slot-initializer ::= id `.' id [initializer] - (let ((parse-init (if must-init-p - #'parse-initializer + (let ((parse-init (if must-init-p #'parse-initializer (parser () (? (parse-initializer)))))) (parse (and (skip-many () (seq ((name-a :id) #\. (name-b :id) @@ -385,11 +384,9 @@ (defun parse-class-body (scanner pset name supers) (car dc) (cdr dc)))))) (and "class" - (parse-initializer-item - sub-pset t + (parse-initializer-item sub-pset t #'make-sod-class-initializer)) - (parse-initializer-item - sub-pset nil + (parse-initializer-item sub-pset nil #'make-sod-instance-initializer))))) (parse (seq (#\{