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

[sod] / src / module-parse.lisp

diff --git a/src/module-parse.lisp b/src/module-parse.lisp
index f6d69eed1a51323c81bf6ae439d78b20c3225e22..2d81de17037157e703cf9b8f6a6d7e421e5fca0a 100644 (file)
--- a/src/module-parse.lisp
+++ b/src/module-parse.lisp
@@ -31,26 +31,29 @@ (in-package #:sod)
 ;;; Type names.
 
 (define-pluggable-parser module typename (scanner pset)
 ;;; 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"
   (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 `}'
   ;;
 
 ;;; 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))
   ;; constraint ::= item-name+
   ;; item-name ::= id | `(' id+ `)'
   (declare (ignore pset))


@@ -63,23 +66,28 @@ (define-pluggable-parser module code (scanner pset)
                          (seq (#\( (names (list (:min 1) (kw))) #\))
                            names)))))
       (parse (seq ("code"
                          (seq (#\( (names (list (:min 1) (kw))) #\))
                            names)))))
       (parse (seq ("code"

-                  (reason (kw))
-                  #\:
-                  (name (item))
+                  (reason (must (kw)))
+                  (nil (must #\:))
+                  (name (must (item)))

                   (constraints (? (seq (#\[
                   (constraints (? (seq (#\[

-                                        (constraints (list (:min 1)
-                                                       (list (:min 1)
-                                                         (item))
-                                                       #\,))
+                                        (constraints
+                                         (list ()
+                                           (list (:min 1)
+                                             (error (:ignore-unconsumed t)
+                                                 (item)
+                                               (skip-until ()
+                                                 :id #\( #\, #\])))
+                                           #\,))

                                         #\])
                                     constraints)))
                   (fragment (parse-delimited-fragment scanner #\{ #\})))
                                         #\])
                                     constraints)))
                   (fragment (parse-delimited-fragment scanner #\{ #\})))

-              (add-to-module *module*
-                             (make-instance 'code-fragment-item
-                                            :fragment fragment
-                                            :constraints constraints
-                                            :reason reason
-                                            :name name)))))))
+              (when name
+                (add-to-module *module*
+                               (make-instance 'code-fragment-item
+                                              :fragment fragment
+                                              :constraints constraints
+                                              :reason reason
+                                              :name name))))))))

 
 ;;; External files.
 
 
 ;;; External files.
 


@@ -101,23 +109,30 @@ (defun read-module (pathname &key (truename nil truep) location)
   (define-module (pathname :location location :truename truename)
     (with-open-file (f-stream pathname :direction :input)
       (let* ((*readtable* (copy-readtable))
   (define-module (pathname :location location :truename truename)
     (with-open-file (f-stream pathname :direction :input)
       (let* ((*readtable* (copy-readtable))

+            (*package* (find-package '#:sod-user))

             (char-scanner (make-instance 'charbuf-scanner
             (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)
          (with-parser-context (token-scanner-context :scanner scanner)
             (scanner (make-instance 'sod-token-scanner
                                     :char-scanner char-scanner)))
        (with-default-error-location (scanner)
          (with-parser-context (token-scanner-context :scanner scanner)

-           (parse (skip-many ()
-                    (seq ((pset (parse-property-set scanner))
-                          (nil (error ()
-                                 (plug module scanner pset))))
-                      (check-unused-properties pset))))))))))
+           (multiple-value-bind (result winp consumedp)
+               (parse (skip-many ()
+                         (seq ((pset (parse-property-set scanner))
+                               (nil (error ()
+                                        (plug module scanner pset)
+                                      (skip-until (:keep-end nil)
+                                        #\; #\}))))
+                           (check-unused-properties pset))))
+             (declare (ignore consumedp))
+             (unless winp (syntax-error scanner result)))))))))

 
 (define-pluggable-parser module test (scanner pset)
   ;; `demo' string `;'
   (declare (ignore pset))
   (with-parser-context (token-scanner-context :scanner scanner)
 
 (define-pluggable-parser module test (scanner pset)
   ;; `demo' string `;'
   (declare (ignore pset))
   (with-parser-context (token-scanner-context :scanner scanner)

-    (parse (seq ("demo" (string :string) #\;)
+    (parse (seq ("demo" (string (must :string)) (nil (must #\;)))

             (format t ";; DEMO ~S~%" string)))))
 
 (define-pluggable-parser module file (scanner pset)
             (format t ";; DEMO ~S~%" string)))))
 
 (define-pluggable-parser module file (scanner pset)


@@ -125,14 +140,15 @@ (define-pluggable-parser module file (scanner pset)
   ;; `load' string `;'
   (declare (ignore pset))
   (flet ((common (name type what thunk)
   ;; `load' string `;'
   (declare (ignore pset))
   (flet ((common (name type what thunk)

-          (find-file scanner
-                     (merge-pathnames name
-                                      (make-pathname :type type
-                                                     :case :common))
-                     what
-                     thunk)))
+          (when name
+            (find-file scanner
+                       (merge-pathnames name
+                                        (make-pathname :type type
+                                                       :case :common))
+                       what
+                       thunk))))

     (with-parser-context (token-scanner-context :scanner scanner)
     (with-parser-context (token-scanner-context :scanner scanner)

-      (parse (or (seq ("import" (name :string) #\;)
+      (parse (or (seq ("import" (name (must :string)) (nil (must #\;)))

                   (common name "SOD" "module"
                           (lambda (path true)
                             (handler-case
                   (common name "SOD" "module"
                           (lambda (path true)
                             (handler-case


@@ -145,8 +161,12 @@ (define-pluggable-parser module file (scanner pset)
                                               *module*))))
                               (file-error (error)
                                 (cerror* "Error reading module ~S: ~A"
                                               *module*))))
                               (file-error (error)
                                 (cerror* "Error reading module ~S: ~A"

+                                         path error))
+                              (error (error)
+                                (cerror* "Unexpected error reading ~
+                                          module ~S: ~A"

                                          path error))))))
                                          path error))))))

-                (seq ("load" (name :string) #\;)
+                (seq ("load" (name (must :string)) (nil (must #\;)))

                   (common name "LISP" "Lisp file"
                           (lambda (path true)
                             (handler-case
                   (common name "LISP" "Lisp file"
                           (lambda (path true)
                             (handler-case


@@ -158,23 +178,23 @@ (define-pluggable-parser module file (scanner pset)
 ;;; Setting properties.
 
 (define-pluggable-parser module set (scanner pset)
 ;;; 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)
   (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))
                                      (setf (p-seenp prop) t))
                                    pset))

-                       (parse (skip-many (:min 0)
+                       (parse (skip-many (:min (if pset 0 1))

                                 (error (:ignore-unconsumed t)
                                 (error (:ignore-unconsumed t)

-                                  (parse-property scanner module-pset)
-                                  (skip-until (:keep-end t) #\, #\;))
+                                    (parse-property scanner module-pset)
+                                  (skip-until () #\, #\;))

                                 #\,))))
                #\;))))
 
                                 #\,))))
                #\;))))
 


@@ -191,7 +211,7 @@ (define-pluggable-parser module lisp (scanner pset)
                             (scanner-step scanner)
                             (values sexp t t))
                           (values '((:id "lisp")) nil nil)))
                             (scanner-step scanner)
                             (values sexp t t))
                           (values '((:id "lisp")) nil nil)))

-                #\;)
+                (nil (must #\;)))

             (eval sexp)))))
 
 ;;;--------------------------------------------------------------------------
             (eval sexp)))))
 
 ;;;--------------------------------------------------------------------------


@@ -208,13 +228,38 @@ (define-pluggable-parser class-item initfrags (scanner class pset)
                 (frag (parse-delimited-fragment scanner #\{ #\})))
             (funcall make class frag pset scanner)))))
 
                 (frag (parse-delimited-fragment scanner #\{ #\})))
             (funcall make class frag pset scanner)))))
 

+(define-pluggable-parser class-item initargs (scanner class pset)
+  ;; initarg-item ::= `initarg' declspec+ list[init-declarator]
+  ;; init-declarator ::= declarator [`=' initializer]
+  (with-parser-context (token-scanner-context :scanner scanner)
+    (parse (seq ("initarg"
+                (base-type (parse-c-type scanner))
+                (nil (skip-many (:min 1)
+                       (seq ((declarator (parse-declarator scanner
+                                                           base-type))
+                             (init (? (parse-delimited-fragment
+                                       scanner #\= (list #\; #\,)
+                                       :keep-end t))))
+                         (make-sod-user-initarg class
+                                                (cdr declarator)
+                                                (car declarator)
+                                                pset init scanner))
+                       #\,))
+                (nil (must #\;)))))))
+

 (defun parse-class-body (scanner pset name supers)
   ;; class-body ::= `{' class-item* `}'
   ;;
   ;; class-item ::= property-set raw-class-item
   (with-parser-context (token-scanner-context :scanner scanner)
     (make-class-type name)
 (defun parse-class-body (scanner pset name supers)
   ;; class-body ::= `{' class-item* `}'
   ;;
   ;; class-item ::= property-set raw-class-item
   (with-parser-context (token-scanner-context :scanner scanner)
     (make-class-type name)

-    (let* ((class (make-sod-class name (mapcar #'find-sod-class supers)
+    (let* ((duff nil)
+          (class (make-sod-class name
+                                 (restart-case
+                                     (mapcar #'find-sod-class supers)
+                                   (continue ()
+                                     (setf duff t)
+                                     (list (find-sod-class "SodObject"))))

                                  pset scanner))
           (nick (sod-class-nickname class)))
 
                                  pset scanner))
           (nick (sod-class-nickname class)))
 


@@ -272,10 +317,9 @@ (defun parse-class-body (scanner pset name supers)
               (parse-slot-item (sub-pset base-type type name)
                 ;; slot-item ::=
                 ;;     declspec+ declarator -!- [initializer]
               (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)
                 (parse (and (seq ((init (? (parse-initializer))))
                               (make-sod-slot class name type
                                              sub-pset scanner)


@@ -295,19 +339,21 @@ (defun parse-class-body (scanner pset name supers)
                                    sub-pset scanner))))
                             #\;)))
 
                                    sub-pset scanner))))
                             #\;)))
 

-              (parse-initializer-item (sub-pset constructor)
+              (parse-initializer-item (sub-pset must-init-p constructor)

                 ;; initializer-item ::=
                 ;; initializer-item ::=

-                ;;     [`class'] -!- slot-initializer-list `;'
+                ;;     [`class'] -!- list[slot-initializer] `;'

                 ;;
                 ;;

-                ;; slot-initializer ::= id `.' id initializer
-                (parse (and (skip-many ()
-                              (seq ((name-a :id) #\. (name-b :id)
-                                    (init (parse-initializer)))
-                                (funcall constructor class
-                                         name-a name-b init
-                                         sub-pset scanner))
-                              #\,)
-                            #\;)))
+                ;; slot-initializer ::= id `.' id [initializer]
+                (let ((parse-init (if must-init-p #'parse-initializer
+                                      (parser () (? (parse-initializer))))))
+                  (parse (and (skip-many ()
+                                (seq ((name-a :id) #\. (name-b :id)
+                                      (init (funcall parse-init)))
+                                  (funcall constructor class
+                                           name-a name-b init
+                                           sub-pset scanner))
+                                #\,)
+                              #\;))))

 
               (class-item-dispatch (sub-pset base-type type name)
                 ;; Logically part of `parse-raw-class-item', but the
 
               (class-item-dispatch (sub-pset base-type type name)
                 ;; Logically part of `parse-raw-class-item', but the


@@ -321,9 +367,8 @@ (defun parse-class-body (scanner pset name supers)
                 ;; definition; otherwise it might be a message or slot.
                 (cond ((not (typep type 'c-function-type))
                        (when (consp name)
                 ;; definition; otherwise it might be a message or slot.
                 (cond ((not (typep type 'c-function-type))
                        (when (consp name)

-                         (cerror*-with-location
-                          scanner
-                          "Method declarations must have function type.")
+                         (cerror*
+                          "Method declarations must have function type")

                          (setf name (cdr name)))
                        (parse-slot-item sub-pset base-type type name))
                       ((consp name)
                          (setf name (cdr name)))
                        (parse-slot-item sub-pset base-type type name))
                       ((consp name)


@@ -347,16 +392,15 @@ (defun parse-class-body (scanner pset name supers)
                            (peek
                             (seq ((ds (parse-c-type scanner))
                                   (dc (parse-maybe-dotted-declarator ds))
                            (peek
                             (seq ((ds (parse-c-type scanner))
                                   (dc (parse-maybe-dotted-declarator ds))

+                                  (nil (commit))

                                   (nil (class-item-dispatch sub-pset
                                                             ds
                                                             (car dc)
                                                             (cdr dc))))))
                            (and "class"
                                   (nil (class-item-dispatch sub-pset
                                                             ds
                                                             (car dc)
                                                             (cdr dc))))))
                            (and "class"

-                                (parse-initializer-item
-                                 sub-pset
+                                (parse-initializer-item sub-pset t

                                  #'make-sod-class-initializer))
                                  #'make-sod-class-initializer))

-                           (parse-initializer-item
-                            sub-pset
+                           (parse-initializer-item sub-pset nil

                             #'make-sod-instance-initializer)))))
 
        (parse (seq (#\{
                             #'make-sod-instance-initializer)))))
 
        (parse (seq (#\{


@@ -365,19 +409,21 @@ (defun parse-class-body (scanner pset name supers)
                                  (nil (parse-raw-class-item sub-pset)))
                              (check-unused-properties sub-pset))))
                     (nil (error () #\})))
                                  (nil (parse-raw-class-item sub-pset)))
                              (check-unused-properties sub-pset))))
                     (nil (error () #\})))

-                (finalize-sod-class class)
-                (add-to-module *module* class)))))))
+                (unless (finalize-sod-class class)
+                  (setf duff t))
+                (unless duff
+                  (add-to-module *module* class))))))))

 
 (define-pluggable-parser module class (scanner pset)
 
 (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"
                 (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)))))))))))