(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 (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 #\{ #\})))
- (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.
;; `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)
;; `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)
- (parse (or (seq ("import" (name :string) #\;)
+ (parse (or (seq ("import" (name (must :string)) (nil (must #\;)))
(common name "SOD" "module"
(lambda (path true)
(handler-case
*module*))))
(file-error (error)
(cerror* "Error reading module ~S: ~A"
+ path error))
+ (error (error)
+ (cerror* "Unexpected error reading ~
+ module ~S: ~A"
path error))))))
- (seq ("load" (name :string) #\;)
+ (seq ("load" (name (must :string)) (nil (must #\;)))
(common name "LISP" "Lisp file"
(lambda (path true)
(handler-case
(scanner-step scanner)
(values sexp t t))
(values '((:id "lisp")) nil nil)))
- #\;)
+ (nil (must #\;)))
(eval sexp)))))
;;;--------------------------------------------------------------------------
(car declarator)
pset init 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)
- (make-class-type name)
- (let* ((duff nil)
- (class (make-sod-class name
+ (when name (make-class-type name))
+ (let* ((duff (null name))
+ (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
(restart-case
- (mapcar #'find-sod-class supers)
+ (mapcar #'find-sod-class
+ (or supers (list "SodObject")))
(continue ()
(setf duff t)
(list (find-sod-class "SodObject"))))
;; `class' id `;'
(with-parser-context (token-scanner-context :scanner scanner)
(parse (seq ("class"
- (name :id)
+ (name (must :id))
(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)))))))))))