lib/keyword.c (kw_parseempty): Use correct variable scanning `kwval' list.

[sod] / src / module-parse.lisp

diff --git a/src/module-parse.lisp b/src/module-parse.lisp
index 211f2c74a84209960b7ef2c46c7a0bae73c318b9..43a49ad177ea4cc0333ff6163952c29777363072 100644 (file)
--- a/src/module-parse.lisp
+++ b/src/module-parse.lisp
@@ -36,19 +36,23 @@ (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.
 
 (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 `}'

+  ;; `code' id `:' constraints `;'

   ;;
   ;; constraints ::= `[' list[constraint] `]'
   ;; constraint ::= item-name+
   ;;
   ;; constraints ::= `[' list[constraint] `]'
   ;; constraint ::= item-name+


@@ -61,30 +65,42 @@ (define-pluggable-parser module code (scanner pset)
             (item ()
               (parse (or (kw)
                          (seq (#\( (names (list (:min 1) (kw))) #\))
             (item ()
               (parse (or (kw)
                          (seq (#\( (names (list (:min 1) (kw))) #\))

-                           names)))))
+                           names))))
+            (constraints ()
+              (parse (seq (#\[
+                           (constraints
+                            (list ()
+                              (list (:min 1)
+                                (error (:ignore-unconsumed t) (item)
+                                  (skip-until () :id #\( #\, #\])))
+                              #\,))
+                           #\])
+                       constraints)))
+            (fragment ()
+              (parse-delimited-fragment scanner #\{ #\})))

       (parse (seq ("code"
       (parse (seq ("code"

-                  (reason (kw))
-                  #\:
-                  (name (item))
-                  (constraints (? (seq (#\[
-                                        (constraints (list (:min 1)
-                                                       (list (:min 1)
-                                                         (item))
-                                                       #\,))
-                                        #\])
-                                    constraints)))
-                  (fragment (parse-delimited-fragment scanner #\{ #\})))
-              (add-to-module *module*
-                             (make-instance 'code-fragment-item
-                                            :fragment fragment
-                                            :constraints constraints
-                                            :reason reason
-                                            :name name)))))))
+                  (reason (must (kw)))
+                  (nil (must #\:))
+                  (item (or (seq ((constraints (constraints))
+                                  (nil (must #\;)))
+                              (make-instance 'code-fragment-item
+                                             :reason reason
+                                             :constraints constraints))
+                            (seq ((name (must (item)))
+                                  (constraints (? (constraints)))
+                                  (fragment (fragment)))
+                              (and name
+                                   (make-instance 'code-fragment-item
+                                                  :reason reason
+                                                  :constraints constraints
+                                                  :name name
+                                                  :fragment fragment))))))
+              (when item (add-to-module *module* item)))))))

 
 ;;; External files.
 
 (export 'read-module)
 
 ;;; External files.
 
 (export 'read-module)

-(defun read-module (pathname &key (truename nil truep) location)
+(defun read-module (pathname &key (truename nil truep) location stream)

   "Parse the file at PATHNAME as a module, returning it.
 
    This is the main entry point for parsing module files.  You may well know
   "Parse the file at PATHNAME as a module, returning it.
 
    This is the main entry point for parsing module files.  You may well know


@@ -99,64 +115,72 @@ (defun read-module (pathname &key (truename nil truep) location)
                                  (make-pathname :type "SOD" :case :common)))
   (unless truep (setf truename (truename pathname)))
   (define-module (pathname :location location :truename truename)
                                  (make-pathname :type "SOD" :case :common)))
   (unless truep (setf truename (truename pathname)))
   (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
-                                         :stream f-stream))
-            (scanner (make-instance 'sod-token-scanner
-                                    :char-scanner char-scanner)))
-       (with-default-error-location (scanner)
-         (with-parser-context (token-scanner-context :scanner scanner)
-           (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)
-    (parse (seq ("demo" (string :string) #\;)
-            (format t ";; DEMO ~S~%" string)))))
+    (flet ((parse (f-stream)
+            (let* ((char-scanner
+                    (make-instance 'charbuf-scanner
+                                   :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)
+                  (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))))))))
+      (if stream (parse stream)
+         (with-open-file (stream pathname :direction :input)
+           (parse stream))))))

 
 (define-pluggable-parser module file (scanner pset)
   ;; `import' string `;'
   ;; `load' string `;'
   (declare (ignore pset))
   (flet ((common (name type what thunk)
 
 (define-pluggable-parser module file (scanner pset)
   ;; `import' string `;'
   ;; `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 (pathname (scanner-filename 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
                                 (let ((module (read-module path
                   (common name "SOD" "module"
                           (lambda (path true)
                             (handler-case
                                 (let ((module (read-module path

-                                                           :truename true)))
+                                                           :truename true
+                                                           :location
+                                                             (file-location
+                                                              scanner))))

                                   (when module
                                     (module-import module)
                                   (when module
                                     (module-import module)

+                                    (pushnew path (module-files *module*))

                                     (pushnew module
                                              (module-dependencies
                                               *module*))))
                               (file-error (error)
                                 (cerror* "Error reading module ~S: ~A"
                                     (pushnew module
                                              (module-dependencies
                                               *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

-                                (load true :verbose nil :print nil)
+                                (progn
+                                  (pushnew path (module-files *module*))
+                                  (load true :verbose nil :print nil))

                               (error (error)
                                 (cerror* "Error loading Lisp file ~S: ~A"
                                          path error)))))))))))
                               (error (error)
                                 (cerror* "Error loading Lisp file ~S: ~A"
                                          path error)))))))))))


@@ -177,7 +201,7 @@ (define-pluggable-parser module set (scanner pset)
                                       :location (p-location prop))
                                      (setf (p-seenp prop) t))
                                    pset))
                                       :location (p-location prop))
                                      (setf (p-seenp prop) t))
                                    pset))

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

                                 (error (:ignore-unconsumed t)
                                     (parse-property scanner module-pset)
                                   (skip-until () #\, #\;))
                                 (error (:ignore-unconsumed t)
                                     (parse-property scanner module-pset)
                                   (skip-until () #\, #\;))


@@ -197,9 +221,63 @@ (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)))))
 

+;;;--------------------------------------------------------------------------
+;;; Static instances.
+
+(define-pluggable-parser module instance (scanner pset)
+  ;; `instance' id id list[slot-initializer] `;'
+  (with-parser-context (token-scanner-context :scanner scanner)
+    (let ((duff nil)
+         (floc nil)
+         (empty-pset (make-property-set)))
+      (parse (seq ("instance"
+                  (class (seq ((class-name (must :id)))
+                           (setf floc (file-location scanner))
+                           (restart-case (find-sod-class class-name)
+                             (continue ()
+                               (setf duff t)
+                               nil))))
+                  (name (must :id))
+                  (inits (? (seq (#\:
+                                  (inits (list (:min 0)
+                                           (seq ((nick (must :id))
+                                                 #\.
+                                                 (name (must :id))
+                                                 (value
+                                                  (parse-delimited-fragment
+                                                   scanner #\= '(#\, #\;)
+                                                   :keep-end t)))
+                                             (make-sod-instance-initializer
+                                              class nick name value
+                                              empty-pset
+                                              :add-to-class nil
+                                              :location scanner))
+                                           #\,)))
+                              inits)))
+                  #\;)
+              (unless duff
+                (acond ((find-if (lambda (item)
+                                   (and (typep item 'static-instance)
+                                        (string= (static-instance-name item)
+                                                 name)))
+                                 (module-items *module*))
+                        (cerror*-with-location floc
+                                               "Instance with name `~A' ~
+                                                already defined."
+                                               name)
+                        (info-with-location (file-location it)
+                                            "Previous definition was ~
+                                             here."))
+                       (t
+                        (add-to-module *module*
+                                       (make-static-instance class name
+                                                             inits
+                                                             pset
+                                                             floc))))))))))
+

 ;;;--------------------------------------------------------------------------
 ;;; Class declarations.
 
 ;;;--------------------------------------------------------------------------
 ;;; Class declarations.
 


@@ -212,7 +290,7 @@ (define-pluggable-parser class-item initfrags (scanner class pset)
     (parse (seq ((make (or (seq ("init") #'make-sod-class-initfrag)
                           (seq ("teardown") #'make-sod-class-tearfrag)))
                 (frag (parse-delimited-fragment scanner #\{ #\})))
     (parse (seq ((make (or (seq ("init") #'make-sod-class-initfrag)
                           (seq ("teardown") #'make-sod-class-tearfrag)))
                 (frag (parse-delimited-fragment scanner #\{ #\})))

-            (funcall make class frag pset scanner)))))
+            (funcall make class frag pset :location scanner)))))

 
 (define-pluggable-parser class-item initargs (scanner class pset)
   ;; initarg-item ::= `initarg' declspec+ list[init-declarator]
 
 (define-pluggable-parser class-item initargs (scanner class pset)
   ;; initarg-item ::= `initarg' declspec+ list[init-declarator]


@@ -229,43 +307,71 @@ (define-pluggable-parser class-item initargs (scanner class pset)
                          (make-sod-user-initarg class
                                                 (cdr declarator)
                                                 (car declarator)
                          (make-sod-user-initarg class
                                                 (cdr declarator)
                                                 (car declarator)

-                                                pset init scanner))
+                                                pset
+                                                :default init
+                                                :location scanner))

                        #\,))
                        #\,))

-                  #\;)))))
+                (nil (must #\;)))))))
+
+(defun synthetic-name ()
+  "Return an obviously bogus synthetic not-identifier."
+  (let ((ix *temporary-index*))
+    (incf *temporary-index*)
+    (make-instance 'temporary-variable :tag (format nil "%%#~A" ix))))

 
 (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)
 
 (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* ((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))
+    (when name (make-class-type name))
+    (let* ((duff (null name))
+          (superclasses
+           (let ((superclasses (restart-case
+                                   (mapcar #'find-sod-class
+                                           (or supers (list "SodObject")))
+                                 (continue ()
+                                   (setf duff t)
+                                   (list (find-sod-class "SodObject"))))))
+             (find-duplicates (lambda (first second)
+                                (declare (ignore second))
+                                (setf duff t)
+                                (cerror* "Class `~A' has duplicate ~
+                                          direct superclass `~A'"
+                                         name first))
+                              superclasses)
+             (delete-duplicates superclasses)))
+          (synthetic-name (or name
+                              (let ((var (synthetic-name)))
+                                (unless pset
+                                  (setf pset (make-property-set)))
+                                (unless (pset-get pset "nick")
+                                  (add-property pset "nick" var :type :id))
+                                var)))
+          (class (make-sod-class synthetic-name superclasses pset
+                                 :location scanner))

           (nick (sod-class-nickname class)))
 
           (nick (sod-class-nickname class)))
 

-      (labels ((parse-maybe-dotted-declarator (base-type)
-                ;; Parse a declarator or dotted-declarator, i.e., one whose
-                ;; centre is
-                ;;
-                ;; maybe-dotted-identifier ::= [id `.'] id
+      (labels ((must-id ()
+                (parse (must :id (progn (setf duff t) (synthetic-name)))))
+
+              (parse-maybe-dotted-name ()
+                ;; maybe-dotted-name ::= [id `.'] id

                 ;;
                 ;; A plain identifier is returned as a string, as usual; a
                 ;; dotted identifier is returned as a cons cell of the two
                 ;; names.
                 ;;
                 ;; A plain identifier is returned as a string, as usual; a
                 ;; dotted identifier is returned as a cons cell of the two
                 ;; names.

-                (parse-declarator
-                 scanner base-type
-                 :keywordp t
-                 :kernel (parser ()
-                           (seq ((name-a :id)
-                                 (name-b (? (seq (#\. (id :id)) id))))
-                             (if name-b (cons name-a name-b)
-                                 name-a)))))
+                (parse (seq ((name-a (must-id))
+                             (name-b (? (seq (#\. (id (must-id))) id))))
+                         (if name-b (cons name-a name-b)
+                             name-a))))
+
+              (parse-maybe-dotted-declarator (base-type)
+                ;; Parse a declarator or dotted-declarator, i.e., one whose
+                ;; centre is maybe-dotted-name above.
+                (parse-declarator scanner base-type
+                                  :keywordp t
+                                  :kernel #'parse-maybe-dotted-name))

 
               (parse-message-item (sub-pset type name)
                 ;; message-item ::=
 
               (parse-message-item (sub-pset type name)
                 ;; message-item ::=


@@ -274,8 +380,8 @@ (defun parse-class-body (scanner pset name supers)
                 ;; Don't allow a method-body here if the message takes a
                 ;; varargs list, because we don't have a name for the
                 ;; `va_list' parameter.
                 ;; Don't allow a method-body here if the message takes a
                 ;; varargs list, because we don't have a name for the
                 ;; `va_list' parameter.

-                (let ((message (make-sod-message class name type
-                                                 sub-pset scanner)))
+                (let ((message (make-sod-message class name type sub-pset
+                                                 :location scanner)))

                   (if (varargs-message-p message)
                       (parse #\;)
                       (parse (or #\; (parse-method-item sub-pset
                   (if (varargs-message-p message)
                       (parse #\;)
                       (parse (or #\; (parse-method-item sub-pset


@@ -289,15 +395,18 @@ (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
+                                              :location scanner)
+                           (continue () :report "Continue")))))

 
               (parse-initializer ()
                 ;; initializer ::= `=' c-fragment
                 ;;
                 ;; Return a VALUE, ready for passing to a `sod-initializer'
                 ;; constructor.
 
               (parse-initializer ()
                 ;; initializer ::= `=' c-fragment
                 ;;
                 ;; Return a VALUE, ready for passing to a `sod-initializer'
                 ;; constructor.

-                (parse-delimited-fragment scanner #\= (list #\, #\;)
+                (parse-delimited-fragment scanner #\= '(#\, #\;)

                                           :keep-end t))
 
               (parse-slot-item (sub-pset base-type type name)
                                           :keep-end t))
 
               (parse-slot-item (sub-pset base-type type name)


@@ -306,24 +415,29 @@ (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
+                                              :location scanner)
+                               (when init
+                                 (make-sod-instance-initializer
+                                  class nick name init sub-pset
+                                  :location scanner)))
+                           (continue () :report "Continue"))))
+                  (parse (and (error ()
+                                  (seq ((init (? (parse-initializer))))
+                                    (make-it name type init))
+                                (skip-until () #\, #\;))
+                              (skip-many ()
+                                (error (:ignore-unconsumed t)
+                                    (seq (#\,
+                                          (ds (parse-declarator scanner
+                                                                base-type))
+                                          (init (? (parse-initializer))))
+                                      (make-it (cdr ds) (car ds) init))
+                                  (skip-until () #\, #\;)))
+                              (must #\;)))))

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


@@ -333,13 +447,19 @@ (defun parse-class-body (scanner pset name supers)
                 (let ((parse-init (if must-init-p #'parse-initializer
                                       (parser () (? (parse-initializer))))))
                   (parse (and (skip-many ()
                 (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))
+                                (error (:ignore-unconsumed t)
+                                    (seq ((name-a :id) #\.
+                                          (name-b (must-id))
+                                          (init (funcall parse-init)))
+                                      (restart-case
+                                          (funcall constructor class
+                                                   name-a name-b init
+                                                   sub-pset
+                                                   :location scanner)
+                                        (continue () :report "Continue")))
+                                  (skip-until () #\, #\;))

                                 #\,)
                                 #\,)

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

 
               (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


@@ -389,12 +509,12 @@ (defun parse-class-body (scanner pset name supers)
                            (parse-initializer-item sub-pset nil
                             #'make-sod-instance-initializer)))))
 
                            (parse-initializer-item sub-pset nil
                             #'make-sod-instance-initializer)))))
 

-       (parse (seq (#\{
+       (parse (seq ((nil (must #\{))

                     (nil (skip-many ()
                            (seq ((sub-pset (parse-property-set scanner))
                                  (nil (parse-raw-class-item sub-pset)))
                              (check-unused-properties sub-pset))))
                     (nil (skip-many ()
                            (seq ((sub-pset (parse-property-set scanner))
                                  (nil (parse-raw-class-item sub-pset)))
                              (check-unused-properties sub-pset))))

-                    (nil (error () #\})))
+                    (nil (must #\})))

                 (unless (finalize-sod-class class)
                   (setf duff t))
                 (unless duff
                 (unless (finalize-sod-class class)
                   (setf duff t))
                 (unless duff


@@ -405,11 +525,12 @@ (define-pluggable-parser module class (scanner pset)
   ;; `class' id `;'
   (with-parser-context (token-scanner-context :scanner scanner)
     (parse (seq ("class"
   ;; `class' id `;'
   (with-parser-context (token-scanner-context :scanner scanner)
     (parse (seq ("class"

-                (name :id)
+                (name (must :id))

                 (nil (or (seq (#\;)
                 (nil (or (seq (#\;)

-                           (make-class-type name))
-                         (seq ((supers (seq (#\: (ids (list () :id #\,)))
-                                         ids))
+                           (when name (make-class-type name)))
+                         (seq ((supers (must (seq (#\:
+                                                   (ids (list () :id #\,)))
+                                               ids)))

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