From c41a95b125742d97c2d0ff782964c30421eaf5ee Mon Sep 17 00:00:00 2001
Message-Id: <c41a95b125742d97c2d0ff782964c30421eaf5ee.1715428886.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Thu, 26 May 2016 09:26:09 +0100
Subject: [PATCH] src/module-parse.lisp: Improve error recovery for `typename'
 items.
Organization: Straylight/Edgeware

From: Mark Wooding <mdw@distorted.org.uk>

---
 src/module-parse.lisp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/module-parse.lisp b/src/module-parse.lisp
index b72d7c8..cb3fcb2 100644
--- a/src/module-parse.lisp
+++ b/src/module-parse.lisp
@@ -36,14 +36,17 @@ (define-pluggable-parser module typename (scanner pset)
   (with-parser-context (token-scanner-context :scanner scanner)
     (parse (and "typename"
 		(skip-many ()
-		  (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))))
+		  (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.
 
-- 
[mdw]