src/: Fix some docstrings.

[sod] / src / pset-parse.lisp

diff --git a/src/pset-parse.lisp b/src/pset-parse.lisp
index 0bc4680072ce2f5c607dd533b720ff30d8178f66..11b400353b3acba616ddad13274c2a409ce30f60 100644 (file)
--- a/src/pset-parse.lisp
+++ b/src/pset-parse.lisp
@@ -82,7 +82,8 @@     (defun parse-expression (scanner)
    expression: term | expression `+' term | expression `-' term
    term: factor | term `*' factor | term `/' factor
    factor: primary | `+' factor | `-' factor
    expression: term | expression `+' term | expression `-' term
    term: factor | term `*' factor | term `/' factor
    factor: primary | `+' factor | `-' factor

-   primary: int | id | string | `(' expression `)' | `?' lisp-expression
+   primary: int | id | string | `(' expression `)' | `{' fragment `}'
+     | `?' lisp-expression

 
    Only operators for dealing with integers are provided."
       (with-parser-context (token-scanner-context :scanner scanner)
 
    Only operators for dealing with integers are provided."
       (with-parser-context (token-scanner-context :scanner scanner)


@@ -98,8 +99,14 @@     (defun parse-expression (scanner)
                            (let* ((stream (make-scanner-stream scanner))
                                   (sexp (read stream t)))
                              (scanner-step scanner)
                            (let* ((stream (make-scanner-stream scanner))
                                   (sexp (read stream t)))
                              (scanner-step scanner)

-                             (values (cons (property-type sexp) sexp)
-                                     t t)))
+                             (multiple-value-bind (type value)
+                                 (decode-property sexp)
+                               (values (cons type value) t t))))
+                          (#\{
+                           (values (cons :fragment
+                                         (parse-delimited-fragment scanner
+                                                                   #\{ #\}))
+                                         t t))

                           (t
                            (values (list :int :id :char :string #\?)
                                    nil nil)))))
                           (t
                            (values (list :int :id :char :string #\?)
                                    nil nil)))))


@@ -130,13 +137,15 @@ (defun parse-property (scanner pset)
 (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 --------------------------------------------------