X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/6362119ed7d736a6617f59f46ec98b6351cb9867..6f4f8db4ab19a3029e293918184a2a1f452bc85f:/src/module-parse.lisp diff --git a/src/module-parse.lisp b/src/module-parse.lisp index e175a5b..170d61f 100644 --- a/src/module-parse.lisp +++ b/src/module-parse.lisp @@ -128,20 +128,13 @@ (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 (must :string)) (nil (must #\;))) - (format t ";; DEMO ~S~%" string))))) - (define-pluggable-parser module file (scanner pset) ;; `import' string `;' ;; `load' string `;' (declare (ignore pset)) (flet ((common (name type what thunk) (when name - (find-file scanner + (find-file (pathname (scanner-filename scanner)) (merge-pathnames name (make-pathname :type type :case :common)) @@ -156,6 +149,7 @@ :truename true))) (when module (module-import module) + (pushnew path (module-files *module*)) (pushnew module (module-dependencies *module*)))) @@ -170,7 +164,9 @@ (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))))))))))) @@ -226,7 +222,7 @@ (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] @@ -243,7 +239,9 @@ (make-sod-user-initarg class (cdr declarator) (car declarator) - pset init scanner)) + pset + :default init + :location scanner)) #\,)) (nil (must #\;))))))) @@ -260,6 +258,21 @@ (with-parser-context (token-scanner-context :scanner 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 @@ -267,33 +280,30 @@ (unless (pset-get pset "nick") (add-property pset "nick" var :type :id)) var))) - (class (make-sod-class synthetic-name - (restart-case - (mapcar #'find-sod-class - (or supers (list "SodObject"))) - (continue () - (setf duff t) - (list (find-sod-class "SodObject")))) - pset scanner)) + (class (make-sod-class synthetic-name superclasses pset + :location scanner)) (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. - (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 ::= @@ -302,8 +312,8 @@ ;; 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 @@ -317,15 +327,18 @@ (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-delimited-fragment scanner #\= (list #\, #\;) + (parse-delimited-fragment scanner #\= '(#\, #\;) :keep-end t)) (parse-slot-item (sub-pset base-type type name) @@ -334,24 +347,29 @@ ;; [`,' 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 ::= @@ -361,13 +379,19 @@ (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 @@ -417,12 +441,12 @@ (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 (error () #\}))) + (nil (must #\}))) (unless (finalize-sod-class class) (setf duff t)) (unless duff