suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correction to parser specification for constructor definitions

Browse Source 
svn: r6948
This commit is contained in:
Kathy Gray 2007-07-22 23:35:47 +00:00
parent fbd17e8f4b
commit 9c76c0ab88
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
collects/profj/comb-parsers/parser-units.scm
View File

@ -21,6 +21,7 @@
(define class-type "keyword")
(define (output-map x)
#;(!!! (printf "in output-map ~a~n" x))
(!!! (when (position-token? x)
(set! x (position-token-token x))))
(!!! (case (token-name x)
@ -395,6 +396,11 @@
(define instanceof-back
(sequence (instanceof name) "instanceof expression"))
(define super-ctor
(choose ((sequence (super O_PAREN C_PAREN) id)
(sequence (super O_PAREN (comma-sep expression "arguments") C_PAREN) id))
"super constructor call"))
(define super-call
(choose ((sequence (super PERIOD identifier O_PAREN C_PAREN) id)
(sequence (super PERIOD identifier O_PAREN (comma-sep expression "arguments") C_PAREN) id))
@ -738,9 +744,8 @@
(define constructor
(make-constructor #f
(choose ((sequence ((super-call expression) (repeat statement)) id)
(sequence ((this-call expression) (repeat statement)) id)
(repeat statement)) "constructor body")))
(choose ((sequence (super-ctor-call (repeat statement)) id)
(repeat statement)) "constructor body")))
(define interface
(interface-def
@ -821,8 +826,8 @@
(define constructor
(make-constructor access-mods
(choose ((sequence ((super-call expression) (repeat statement)) id)
(sequence ((this-call expression) (repeat statement)) id)
(choose ((sequence (super-ctor-call (repeat statement)) id)
(sequence (this-call (repeat statement)) id)
(repeat statement)) "constructor body")))
(define interface
@ -922,8 +927,8 @@
(define constructor
(make-constructor access-mods
(choose ((sequence ((super-call expression) (repeat statement)) id)
(sequence ((this-call expression) (repeat statement)) id)
(choose ((sequence (super-ctor-call (repeat statement)) id)
(sequence (this-call (repeat statement)) id)
(repeat statement)) "constructor body")))
(define interface
@ -952,6 +957,7 @@
(export token-proc^)
(define (old-tokens->new tok-list)
#;(!!! (printf "old-tokens->new ~a~n" (map position-token-token tok-list)))
(cond
[(null? tok-list) null]
[(eq? (token-name (position-token-token (car tok-list))) 'EOF) null]

4
collects/profj/parsers/intermediate-access-parser.ss
View File

@ -413,11 +413,11 @@
[(ClassInstanceCreationExpression) $1])
(IfThenElseStatement
[(if O_PAREN Expression C_PAREN StatementNoShortIf else Statement)
[(if O_PAREN Expression C_PAREN Block else Block)
(make-ifS $3 $5 $7 (build-src 1) (build-src 7))])
(IfThenElseStatementNoShortIf
[(if O_PAREN Expression C_PAREN StatementNoShortIf else StatementNoShortIf)
[(if O_PAREN Expression C_PAREN Block else Block)
(make-ifS $3 $5 $7 (build-src 1) (build-src 7))])
(StatementExpressionList

4
collects/profj/parsers/intermediate-parser.ss
View File

@ -410,11 +410,11 @@
[(ClassInstanceCreationExpression) $1])
(IfThenElseStatement
[(if O_PAREN Expression C_PAREN StatementNoShortIf else Statement)
[(if O_PAREN Expression C_PAREN Block else Block)
(make-ifS $3 $5 $7 (build-src 1) (build-src 7))])
(IfThenElseStatementNoShortIf
[(if O_PAREN Expression C_PAREN StatementNoShortIf else StatementNoShortIf)
[(if O_PAREN Expression C_PAREN Block else Block)
(make-ifS $3 $5 $7 (build-src 1) (build-src 7))])
(StatementExpressionList