X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/sod/blobdiff_plain/01e3faf9aaf5674955083ae7b190fcc84d35afbd..167524b5890cdbf4a832b1766a328f6d8a1f8f04:/src/module-parse.lisp

diff --git a/src/module-parse.lisp b/src/module-parse.lisp
index a42c31f..9522085 100644
--- a/src/module-parse.lisp
+++ b/src/module-parse.lisp
@@ -48,21 +48,28 @@ (define-pluggable-parser module typename (scanner pset)
 ;;; Fragments.
 
 (define-pluggable-parser module code (scanner pset)
-  ;; `code' id `:' id [constraints] `{' c-fragment `}'
+  ;; `code' id `:' item-name [constraints] `{' c-fragment `}'
   ;;
   ;; constrains ::= `[' constraint-list `]'
-  ;; constraint ::= id+
+  ;; constraint ::= item-name+
+  ;; item-name ::= id | `(' id+ `)'
   (declare (ignore pset))
   (with-parser-context (token-scanner-context :scanner scanner)
-    (flet ((kw ()
-	     (parse (seq ((kw :id)) (intern (string-upcase kw) 'keyword)))))
+    (labels ((kw ()
+	       (parse (seq ((kw :id))
+			(intern (frob-identifier kw) 'keyword))))
+	     (item ()
+	       (parse (or (kw)
+			  (seq (#\( (names (list (:min 1) (kw))) #\))
+			    names)))))
       (parse (seq ("code"
 		   (reason (kw))
 		   #\:
-		   (name (kw))
+		   (name (item))
 		   (constraints (? (seq (#\[
 					 (constraints (list (:min 1)
-							(list (:min 1) (kw))
+							(list (:min 1)
+							  (item))
 							#\,))
 					 #\])
 				     constraints)))