X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/sod/blobdiff_plain/c41a95b125742d97c2d0ff782964c30421eaf5ee..7605e373dc975bf8e69f57d9e0ce99a2d9d774c7:/src/module-parse.lisp

diff --git a/src/module-parse.lisp b/src/module-parse.lisp
index cb3fcb2..014e7e3 100644
--- a/src/module-parse.lisp
+++ b/src/module-parse.lisp
@@ -66,23 +66,28 @@ (define-pluggable-parser module code (scanner pset)
 			  (seq (#\( (names (list (:min 1) (kw))) #\))
 			    names)))))
       (parse (seq ("code"
-		   (reason (kw))
-		   #\:
-		   (name (item))
+		   (reason (must (kw)))
+		   (nil (must #\:))
+		   (name (must (item)))
 		   (constraints (? (seq (#\[
-					 (constraints (list (:min 1)
-							(list (:min 1)
-							  (item))
-							#\,))
+					 (constraints
+					  (list ()
+					    (list (:min 1)
+					      (error (:ignore-unconsumed t)
+						  (item)
+						(skip-until ()
+						  :id #\( #\, #\])))
+					    #\,))
 					 #\])
 				     constraints)))
 		   (fragment (parse-delimited-fragment scanner #\{ #\})))
-	       (add-to-module *module*
-			      (make-instance 'code-fragment-item
-					     :fragment fragment
-					     :constraints constraints
-					     :reason reason
-					     :name name)))))))
+	       (when name
+		 (add-to-module *module*
+				(make-instance 'code-fragment-item
+					       :fragment fragment
+					       :constraints constraints
+					       :reason reason
+					       :name name))))))))
 
 ;;; External files.
 
@@ -127,7 +132,7 @@ (define-pluggable-parser module test (scanner pset)
   ;; `demo' string `;'
   (declare (ignore pset))
   (with-parser-context (token-scanner-context :scanner scanner)
-    (parse (seq ("demo" (string :string) #\;)
+    (parse (seq ("demo" (string (must :string)) (nil (must #\;)))
 	     (format t ";; DEMO ~S~%" string)))))
 
 (define-pluggable-parser module file (scanner pset)