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

[honu] explicitly check for commas when parsing a comma separated expression sequence

Browse Source
This commit is contained in:
Jon Rafkind 2012-04-11 14:33:21 -06:00
parent c695727aec
commit fa8377883d
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
collects/honu/core/private/compile.rkt
View File

@ -35,9 +35,12 @@
[pattern semicolon]
[pattern honu-comma]
[pattern colon])
#;
(syntax-parse code
[(x:stopper rest ...) (strip-stops #'(rest ...))]
[else code]))
[else code])
code
)
(define-syntax repeat$ (lambda (stx) (raise-syntax-error 'repeat$ "dont use this")))

23
collects/honu/core/private/parse2.rkt
View File

@ -122,13 +122,17 @@
[rest arguments])
(if (empty-syntax? rest)
(reverse used)
(let-values ([(parsed unparsed)
;; FIXME: don't strip all stops, just comma
(parse (strip-stops rest))])
(loop (if parsed
(cons parsed used)
used)
unparsed))))))
(syntax-parse rest #:literal-sets (cruft)
[(honu-comma more ...)
(loop used #'(more ...))]
[else
(let-values ([(parsed unparsed)
;; FIXME: don't strip all stops, just comma
(parse (strip-stops rest))])
(loop (if parsed
(cons parsed used)
used)
unparsed))])))))
(define (stopper? what)
(define-literal-set check (honu-comma semicolon colon))
@ -311,6 +315,7 @@
left re-parse)))))))
(define (do-parse stream precedence left current)
(define-syntax-class atom
;; [pattern x:identifier #:when (not (stopper? #'x))]
[pattern x:identifier]
[pattern x:str]
[pattern x:number])
@ -542,6 +547,10 @@
#'(current parsed-args ...))))
#;
(error 'parse "function call")]
#;
[else (if (not current)
(error 'what "dont know how to parse ~a" #'head)
(values (left current) stream))]
[else (error 'what "dont know how to parse ~a" #'head)])])])])))
(define-values (parsed unparsed)