artemist/mes
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

nyacc: more bugs in cpp tokl->string

Browse source
This commit is contained in:
Matt Wette 2017-02-23 05:37:25 -08:00 committed by Jan Nieuwenhuizen
parent 7bb78f15b8
commit e00dc59ac0
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
module/nyacc/lang/c99/cpp.scm
View file

@ -277,15 +277,24 @@
((('ident . rval) ('ident . lval) . rest)
(iter stl chl (string-append " " rval) (cdr tkl)))
(('space . rest)
(iter stl (cons #\space chl) nxt rest))
((('string . val) . rest)
(iter stl (cons #\" chl) val (cons #\" rest)))
(((key . val) . rest)
((('ident . val) . rest)
(iter stl chl val rest))
((('arg . val) . rest)
(iter stl chl val rest))
((('defined . val) . rest)
(iter stl chl val rest))
(('space . rest)
(iter stl (cons #\space chl) nxt rest))
((asis . rest)
(iter stl chl asis rest))
(otherwise
(error "no match" tkl)))))))
@ -373,12 +382,12 @@
(aval ; arg ref
(iter (acons 'arg aval tkl) lvl (read-char)))
((string? rval) ; cpp repl
(iter (acons 'string rval tkl) lvl (read-char)))
(iter (cons rval tkl) lvl (read-char)))
((pair? rval) ; cpp macro
(let* ((argl (car rval)) (text (cdr rval))
(argd (collect-args argl argd dict used))
(newl (expand-cpp-repl text argd dict (cons iden used))))
(iter (acons 'string newl tkl) lvl (read-char))))
(iter (cons newl tkl) lvl (read-char))))
(else ; normal identifier
(iter (acons 'ident iden tkl) lvl (read-char))))))))
(else