src/lexer-proto.lisp (syntax-error, lexer-error): Improve location handling.

[sod] / src / module-parse.lisp

diff --git a/src/module-parse.lisp b/src/module-parse.lisp
index 9fa9a1fd1c3a5146e7f051bb25723f10f3fc10f0..da1c47f15773c42a9e9e836cf7b8e891046feb6f 100644 (file)
--- a/src/module-parse.lisp
+++ b/src/module-parse.lisp
@@ -396,15 +396,15 @@ (defun parse-class-body (scanner pset name supers)
                 (add-to-module *module* class)))))))
 
 (define-pluggable-parser module class (scanner pset)
                 (add-to-module *module* class)))))))
 
 (define-pluggable-parser module class (scanner pset)

-  ;; `class' id [`:' id-list] class-body
+  ;; `class' id `:' id-list class-body

   ;; `class' id `;'
   (with-parser-context (token-scanner-context :scanner scanner)
     (parse (seq ("class"
                 (name :id)
                 (nil (or (seq (#\;)
                            (make-class-type name))
   ;; `class' id `;'
   (with-parser-context (token-scanner-context :scanner scanner)
     (parse (seq ("class"
                 (name :id)
                 (nil (or (seq (#\;)
                            (make-class-type name))

-                         (seq ((supers (? (seq (#\: (ids (list () :id #\,)))
-                                            ids)))
+                         (seq ((supers (seq (#\: (ids (list () :id #\,)))
+                                         ids))

                                (nil (parse-class-body
                                      scanner
                                      pset name supers)))))))))))
                                (nil (parse-class-body
                                      scanner
                                      pset name supers)))))))))))