chiark
/
gitweb
/
~mdw
/
sod
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b5911ce
)
src/module-parse.lisp: Some minor reformattings.
author
Mark Wooding
<mdw@distorted.org.uk>
Sun, 26 Mar 2017 14:16:18 +0000
(15:16 +0100)
committer
Mark Wooding
<mdw@distorted.org.uk>
Fri, 8 Jun 2018 18:58:28 +0000
(19:58 +0100)
src/module-parse.lisp
patch
|
blob
|
blame
|
history
diff --git
a/src/module-parse.lisp
b/src/module-parse.lisp
index 83828e680e072d93eb920ecce31244e61d18d613..a3396828ce1d1785e84f3f396de3f0e056a40f21 100644
(file)
--- 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)
(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)
(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) #\, #\;))
#\,))))
#\;))))
(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]
;; [`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)
(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"
(car dc)
(cdr dc))))))
(and "class"
- (parse-initializer-item
- sub-pset t
+ (parse-initializer-item sub-pset t
#'make-sod-class-initializer))
#'make-sod-class-initializer))
- (parse-initializer-item
- sub-pset nil
+ (parse-initializer-item sub-pset nil
#'make-sod-instance-initializer)))))
(parse (seq (#\{
#'make-sod-instance-initializer)))))
(parse (seq (#\{