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

xform: further parsing corrections

Browse Source 
Although the previous commit was enough to make the build work, it
wasn't the right fix. Simplify and correct parsing and printing.
This commit is contained in:
Matthew Flatt 2015-06-06 10:13:33 -06:00
parent 26e1dd050d
commit ed4bbcd4ad
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
racket/collects/compiler/private/xform.rkt
View File

@ -204,7 +204,7 @@
(define (character? s)
(and (symbol? s)
(regexp-match #rx"'[\\]?.'" (symbol->string s))))
(regexp-match #rx"'[\\]?.+'" (symbol->string s))))
(define (mk-string s)
(count-newlines s)
@ -246,8 +246,8 @@
(seqs "0" (one+/ D) IS) ;; octal
(seqs (one+/ D) IS)))) ;; integer
(define char-complex (trans (seqs (maybe L) "'([^\\']|\\\\.)+'")))
(define string-complex (trans (seqs (maybe L) "\"([^\\\"]|\\\\.)*\"")))
(define char-complex (trans "'([^\\']|\\\\.)+'"))
(define string-complex (trans "\"([^\\\"]|\\\\.)*\""))
(define simple-table (make-vector 256 #f))
@ -371,11 +371,6 @@
(cond
[(not simple)
(cond
[(regexp-match-positions char-complex s p)
=> (lambda (m)
(loop (cdar m)
(cons (character (subbytes s (caar m) (cdar m)))
result)))]
[(regexp-match-positions symbol-complex s p)
=> (lambda (m)
(loop (cdar m)
@ -386,6 +381,11 @@
(loop (cdar m)
(cons (number (subbytes s (caar m) (cdar m)))
result)))]
[(regexp-match-positions char-complex s p)
=> (lambda (m)
(loop (cdar m)
(cons (character (subbytes s (caar m) (cdar m)))
result)))]
[(regexp-match-positions string-complex s p)
=> (lambda (m)
(loop (cdar m)