src/module-parse.lisp: Improve error recovery for `typename' items.

diff --git a/src/module-parse.lisp b/src/module-parse.lisp
index b72d7c80a25638cafbdbc8ade61dd0096962956c..cb3fcb26d6cd3b6fa1d2c2875e5e2287fbabce31 100644 (file)
--- 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 ()
   (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.
 
 
 ;;; Fragments.