~mdw
/
sod
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src/module-parse.lisp: Use `dotted-name', not `dotted-identifier'.
[sod]
/
src
/
module-parse.lisp
diff --git
a/src/module-parse.lisp
b/src/module-parse.lisp
index
028ad87
..
63d75cd
100644
(file)
--- a/
src/module-parse.lisp
+++ b/
src/module-parse.lisp
@@
-281,7
+281,7
@@
;; Parse a declarator or dotted-declarator, i.e., one whose
;; centre is
;;
;; Parse a declarator or dotted-declarator, i.e., one whose
;; centre is
;;
- ;; maybe-dotted-
identifier
::= [id `.'] id
+ ;; 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
;;
;; A plain identifier is returned as a string, as usual; a
;; dotted identifier is returned as a cons cell of the two
@@
-317,8
+317,10
@@
(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
@@
-335,14
+337,17
@@
;;
;; init-declarator ::= declarator [initializer]
(flet ((make-it (name type init)
;;
;; init-declarator ::= declarator [initializer]
(flet ((make-it (name type init)
- (make-sod-slot class name type
- sub-pset scanner)
- (when init
- (make-sod-instance-initializer class
- nick name
- init
- sub-pset
- scanner))))
+ (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 ()
(parse (and (seq ((init (? (parse-initializer))))
(make-it name type init))
(skip-many ()
@@
-363,9
+368,11
@@
(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")))
#\,)
#\;))))
#\,)
#\;))))