~mdw
/
sod
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactoring more or less complete. Maybe I should test it.
[sod]
/
src
/
pset-parse.lisp
diff --git
a/src/pset-parse.lisp
b/src/pset-parse.lisp
index
0bc4680
..
ff59551
100644
(file)
--- a/
src/pset-parse.lisp
+++ b/
src/pset-parse.lisp
@@
-130,13
+130,15
@@
(export 'parse-property-set)
(defun parse-property-set (scanner)
"Parse an optional property set from the SCANNER and return it."
(export 'parse-property-set)
(defun parse-property-set (scanner)
"Parse an optional property set from the SCANNER and return it."
- ;; property-set ::=
`[' property-list `]'
+ ;; property-set ::=
[`[' property-list `]']
(with-parser-context (token-scanner-context :scanner scanner)
(with-parser-context (token-scanner-context :scanner scanner)
- (parse (seq (#\[
- (pset (many (pset (make-property-set) pset)
- (parse-property scanner pset)
- #\,))
- #\])
- pset))))
+ (parse (? (seq (#\[
+ (pset (many (pset (make-property-set) pset)
+ (error ()
+ (parse-property scanner pset)
+ (skip-until () #\, #\]))
+ #\,))
+ #\])
+ pset)))))
;;;----- That's all, folks --------------------------------------------------
;;;----- That's all, folks --------------------------------------------------