jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for expression parsing, 'new' is a valid C symbol

Browse source
This commit is contained in:
Vincent Burns 2014-01-13 02:01:10 -05:00
commit d9a61c13dd
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/c2nim/cparse.nim
View file

@ -1152,7 +1152,7 @@ proc startExpression(p : var TParser, tok : TToken) : PNode =
eat(p, pxParLe) eat(p, pxParLe)
addSon(result, typeDesc(p)) addSon(result, typeDesc(p))
eat(p, pxParRi) eat(p, pxParRi)
elif tok.s == "new" or tok.s == "delete" and pfCpp in p.options.flags: elif (tok.s == "new" or tok.s == "delete") and pfCpp in p.options.flags:
var opr = tok.s var opr = tok.s
result = newNodeP(nkCall, p) result = newNodeP(nkCall, p)
if p.tok.xkind == pxBracketLe: if p.tok.xkind == pxBracketLe:
@ -2096,9 +2096,12 @@ proc statement(p: var TParser): PNode =
assert result != nil assert result != nil
proc parseUnit(p: var TParser): PNode = proc parseUnit(p: var TParser): PNode =
try:
result = newNodeP(nkStmtList, p) result = newNodeP(nkStmtList, p)
getTok(p) # read first token getTok(p) # read first token
while p.tok.xkind != pxEof: while p.tok.xkind != pxEof:
var s = statement(p) var s = statement(p)
if s.kind != nkEmpty: embedStmts(result, s) if s.kind != nkEmpty: embedStmts(result, s)
except:
parMessage(p, errGenerated, "Uncaught exception raised during parsing")