src/module-parse.lisp: Don't explicitly ask for default behaviour.
[sod] / src / module-parse.lisp
index 4d4d818..197e3e4 100644 (file)
@@ -35,7 +35,7 @@
   (declare (ignore pset))
   (with-parser-context (token-scanner-context :scanner scanner)
     (parse (and "typename"
-               (skip-many (:min 1)
+               (skip-many ()
                  (seq ((id :id))
                    (if (gethash id *module-type-map*)
                        (cerror* "Type `~A' already defined" id)
                        (parse (skip-many (:min 0)
                                 (error (:ignore-unconsumed t)
                                     (parse-property scanner module-pset)
-                                  (skip-until (:keep-end t) #\, #\;))
+                                  (skip-until () #\, #\;))
                                 #\,))))
                #\;))))
 
                 ;; 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))