src/module-parse.lisp: Catch errors during class-item construction.

[sod] / src / module-parse.lisp

diff --git a/src/module-parse.lisp b/src/module-parse.lisp
index e175a5b3ffe1be8d2ab4d6952577d80ffb7d5985..15bfe87161fc113df1256ada44388f9a4fa86142 100644 (file)
--- a/src/module-parse.lisp
+++ b/src/module-parse.lisp
@@ -317,8 +317,10 @@ (defun parse-class-body (scanner pset name supers)
                 (parse (seq ((body (or (seq ("extern" #\;) nil)
                                        (parse-delimited-fragment
                                         scanner #\{ #\}))))
                 (parse (seq ((body (or (seq ("extern" #\;) nil)
                                        (parse-delimited-fragment
                                         scanner #\{ #\}))))

-                         (make-sod-method class sub-nick name type
-                                          body sub-pset scanner))))
+                         (restart-case
+                             (make-sod-method class sub-nick name type
+                                              body sub-pset scanner)
+                           (continue () :report "Continue")))))

 
               (parse-initializer ()
                 ;; initializer ::= `=' c-fragment
 
               (parse-initializer ()
                 ;; initializer ::= `=' c-fragment


@@ -334,24 +336,27 @@ (defun parse-class-body (scanner pset name supers)
                 ;;             [`,' list[init-declarator]] `;'
                 ;;
                 ;; init-declarator ::= declarator [initializer]
                 ;;             [`,' list[init-declarator]] `;'
                 ;;
                 ;; init-declarator ::= declarator [initializer]

-                (parse (and (seq ((init (? (parse-initializer))))
-                              (make-sod-slot class name type
-                                             sub-pset scanner)
-                              (when init
-                                (make-sod-instance-initializer
-                                 class nick name init sub-pset scanner)))
-                            (skip-many ()
-                              (seq (#\,
-                                    (ds (parse-declarator scanner
-                                                          base-type))
-                                    (init (? (parse-initializer))))
-                                (make-sod-slot class (cdr ds) (car ds)
-                                               sub-pset scanner)
-                                (when init
-                                  (make-sod-instance-initializer
-                                   class nick (cdr ds) init
-                                   sub-pset scanner))))
-                            #\;)))
+                (flet ((make-it (name type init)
+                         (restart-case
+                             (progn
+                               (make-sod-slot class name type
+                                              sub-pset scanner)
+                               (when init
+                                 (make-sod-instance-initializer class
+                                                                nick name
+                                                                init
+                                                                sub-pset
+                                                                scanner)))
+                           (continue () :report "Continue"))))
+                  (parse (and (seq ((init (? (parse-initializer))))
+                                (make-it name type init))
+                              (skip-many ()
+                                (seq (#\,
+                                      (ds (parse-declarator scanner
+                                                            base-type))
+                                      (init (? (parse-initializer))))
+                                  (make-it (cdr ds) (car ds) init)))
+                              #\;))))

 
               (parse-initializer-item (sub-pset must-init-p constructor)
                 ;; initializer-item ::=
 
               (parse-initializer-item (sub-pset must-init-p constructor)
                 ;; initializer-item ::=


@@ -363,9 +368,11 @@ (defun parse-class-body (scanner pset name supers)
                   (parse (and (skip-many ()
                                 (seq ((name-a :id) #\. (name-b :id)
                                       (init (funcall parse-init)))
                   (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))
+                                  (restart-case
+                                      (funcall constructor class
+                                               name-a name-b init
+                                               sub-pset scanner)
+                                    (continue () :report "Continue")))

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