X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/c91b90c3bfd3d3e68cc3d3ff3f431d1e73920061..7a35400d896e6697902c2880afeba66965bd0f38:/src/pset-parse.lisp

diff --git a/src/pset-parse.lisp b/src/pset-parse.lisp
index 0bc4680..11b4003 100644
--- a/src/pset-parse.lisp
+++ b/src/pset-parse.lisp
@@ -82,7 +82,8 @@
    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)
@@ -98,8 +99,14 @@
 			    (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)))))
@@ -130,13 +137,15 @@
 (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)
-    (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 --------------------------------------------------