X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/70b33a7810c93bf411f10f37f5f8415d57b5413a..c41a95b125742d97c2d0ff782964c30421eaf5ee:/src/module-parse.lisp

diff --git a/src/module-parse.lisp b/src/module-parse.lisp
index bccc37b..cb3fcb2 100644
--- a/src/module-parse.lisp
+++ b/src/module-parse.lisp
@@ -31,26 +31,29 @@
 ;;; Type names.
 
 (define-pluggable-parser module typename (scanner pset)
-  ;; `typename' id ( `,' id )* `;'
+  ;; `typename' list[id] `;'
   (declare (ignore pset))
   (with-parser-context (token-scanner-context :scanner scanner)
     (parse (and "typename"
-		(skip-many (:min 1)
-		  (seq ((id :id))
-		    (if (gethash id *module-type-map*)
-			(cerror* "Type `~A' already defined" id)
-			(add-to-module *module*
-				       (make-instance 'type-item
-						      :name id))))
+		(skip-many ()
+		  (error ()
+		      (seq ((id :id))
+			(if (or (gethash id *module-type-map*)
+				(find-simple-c-type id))
+			    (cerror* "Type `~A' already defined" id)
+			    (add-to-module *module*
+					   (make-instance 'type-item
+							  :name id))))
+		    (skip-until () #\, #\;))
 		  #\,)
-		#\;))))
+		(must #\;)))))
 
 ;;; Fragments.
 
 (define-pluggable-parser module code (scanner pset)
   ;; `code' id `:' item-name [constraints] `{' c-fragment `}'
   ;;
-  ;; constrains ::= `[' constraint-list `]'
+  ;; constraints ::= `[' list[constraint] `]'
   ;; constraint ::= item-name+
   ;; item-name ::= id | `(' id+ `)'
   (declare (ignore pset))
@@ -103,7 +106,8 @@
       (let* ((*readtable* (copy-readtable))
 	     (*package* (find-package '#:sod-user))
 	     (char-scanner (make-instance 'charbuf-scanner
-					  :stream f-stream))
+					  :stream f-stream
+					  :filename (namestring pathname)))
 	     (scanner (make-instance 'sod-token-scanner
 				     :char-scanner char-scanner)))
 	(with-default-error-location (scanner)
@@ -112,7 +116,9 @@
 		(parse (skip-many ()
 			  (seq ((pset (parse-property-set scanner))
 				(nil (error ()
-				       (plug module scanner pset))))
+					 (plug module scanner pset)
+				       (skip-until (:keep-end nil)
+					 #\; #\}))))
 			    (check-unused-properties pset))))
 	      (declare (ignore consumedp))
 	      (unless winp (syntax-error scanner result)))))))))
@@ -162,23 +168,23 @@
 ;;; Setting properties.
 
 (define-pluggable-parser module set (scanner pset)
-  ;; `set' property-list `;'
+  ;; `set' list[property] `;'
   (with-parser-context (token-scanner-context :scanner scanner)
     (parse (and "set"
 		(lisp (let ((module-pset (module-pset *module*)))
 			(when pset
 			  (pset-map (lambda (prop)
-				      (add-property module-pset
-						    (p-name prop)
-						    (p-value prop)
-						    :type (p-type prop)
-						    :location (p-location prop))
+				      (add-property
+				       module-pset
+				       (p-name prop) (p-value prop)
+				       :type (p-type prop)
+				       :location (p-location prop))
 				      (setf (p-seenp prop) t))
 				    pset))
-			(parse (skip-many (:min 0)
+			(parse (skip-many (:min (if pset 0 1))
 				 (error (:ignore-unconsumed t)
-				   (parse-property scanner module-pset)
-				   (skip-until (:keep-end t) #\, #\;))
+				     (parse-property scanner module-pset)
+				   (skip-until () #\, #\;))
 				 #\,))))
 		#\;))))
 
@@ -213,7 +219,7 @@
 	     (funcall make class frag pset scanner)))))
 
 (define-pluggable-parser class-item initargs (scanner class pset)
-  ;; initarg-item ::= `initarg' declspec+ init-declarator-list
+  ;; initarg-item ::= `initarg' declspec+ list[init-declarator]
   ;; init-declarator ::= declarator [`=' initializer]
   (with-parser-context (token-scanner-context :scanner scanner)
     (parse (seq ("initarg"
@@ -301,10 +307,9 @@
 	       (parse-slot-item (sub-pset base-type type name)
 		 ;; slot-item ::=
 		 ;;	declspec+ declarator -!- [initializer]
-		 ;;		[`,' init-declarator-list] `;'
+		 ;;		[`,' list[init-declarator]] `;'
 		 ;;
-		 ;; init-declarator-list ::=
-		 ;;	declarator [initializer] [`,' init-declarator-list]
+		 ;; init-declarator ::=	declarator [initializer]
 		 (parse (and (seq ((init (? (parse-initializer))))
 			       (make-sod-slot class name type
 					      sub-pset scanner)
@@ -326,11 +331,10 @@
 
 	       (parse-initializer-item (sub-pset must-init-p constructor)
 		 ;; initializer-item ::=
-		 ;;	[`class'] -!- slot-initializer-list `;'
+		 ;;	[`class'] -!- list[slot-initializer] `;'
 		 ;;
 		 ;; slot-initializer ::= id `.' id [initializer]
-		 (let ((parse-init (if must-init-p
-				       #'parse-initializer
+		 (let ((parse-init (if must-init-p #'parse-initializer
 				       (parser () (? (parse-initializer))))))
 		   (parse (and (skip-many ()
 				 (seq ((name-a :id) #\. (name-b :id)
@@ -353,8 +357,7 @@
 		 ;; definition; otherwise it might be a message or slot.
 		 (cond ((not (typep type 'c-function-type))
 			(when (consp name)
-			  (cerror*-with-location
-			   scanner
+			  (cerror*
 			   "Method declarations must have function type")
 			  (setf name (cdr name)))
 			(parse-slot-item sub-pset base-type type name))
@@ -385,11 +388,9 @@
 							     (car dc)
 							     (cdr dc))))))
 			    (and "class"
-				 (parse-initializer-item
-				  sub-pset t
+				 (parse-initializer-item sub-pset t
 				  #'make-sod-class-initializer))
-			    (parse-initializer-item
-			     sub-pset nil
+			    (parse-initializer-item sub-pset nil
 			     #'make-sod-instance-initializer)))))
 
 	(parse (seq (#\{
@@ -398,12 +399,13 @@
 				  (nil (parse-raw-class-item sub-pset)))
 			      (check-unused-properties sub-pset))))
 		     (nil (error () #\})))
-		 (finalize-sod-class class)
+		 (unless (finalize-sod-class class)
+		   (setf duff t))
 		 (unless duff
 		   (add-to-module *module* class))))))))
 
 (define-pluggable-parser module class (scanner pset)
-  ;; `class' id `:' id-list class-body
+  ;; `class' id `:' list[id] class-body
   ;; `class' id `;'
   (with-parser-context (token-scanner-context :scanner scanner)
     (parse (seq ("class"