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

nicer error messages for used keywords as identifiers

Browse source
This commit is contained in:
Araq 2011-06-19 16:22:39 +02:00
commit 54021471e4
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/lexer.nim
View file

@ -165,6 +165,10 @@ proc tokToStr*(tok: TToken): string =
InternalError("tokToStr") InternalError("tokToStr")
result = "" result = ""
proc prettyTok*(tok: TToken): string =
if IsKeyword(tok.tokType): result = "keyword " & tok.ident.s
else: result = tokToStr(tok)
proc PrintTok*(tok: TToken) = proc PrintTok*(tok: TToken) =
write(stdout, TokTypeToStr[tok.tokType]) write(stdout, TokTypeToStr[tok.tokType])
write(stdout, " ") write(stdout, " ")

6
compiler/parser.nim
View file

@ -69,7 +69,7 @@ proc parMessage(p: TParser, msg: TMsgKind, arg: string = "") =
lexMessage(p.lex, msg, arg) lexMessage(p.lex, msg, arg)
proc parMessage(p: TParser, msg: TMsgKind, tok: TToken) = proc parMessage(p: TParser, msg: TMsgKind, tok: TToken) =
lexMessage(p.lex, msg, tokToStr(tok)) lexMessage(p.lex, msg, prettyTok(tok))
proc skipComment(p: var TParser, node: PNode) = proc skipComment(p: var TParser, node: PNode) =
if p.tok.tokType == tkComment: if p.tok.tokType == tkComment:
@ -92,11 +92,11 @@ proc optInd(p: var TParser, n: PNode) =
proc expectIdentOrKeyw(p: TParser) = proc expectIdentOrKeyw(p: TParser) =
if p.tok.tokType != tkSymbol and not isKeyword(p.tok.tokType): if p.tok.tokType != tkSymbol and not isKeyword(p.tok.tokType):
lexMessage(p.lex, errIdentifierExpected, tokToStr(p.tok)) lexMessage(p.lex, errIdentifierExpected, prettyTok(p.tok))
proc ExpectIdent(p: TParser) = proc ExpectIdent(p: TParser) =
if p.tok.tokType != tkSymbol: if p.tok.tokType != tkSymbol:
lexMessage(p.lex, errIdentifierExpected, tokToStr(p.tok)) lexMessage(p.lex, errIdentifierExpected, prettyTok(p.tok))
proc Eat(p: var TParser, TokType: TTokType) = proc Eat(p: var TParser, TokType: TTokType) =
if p.tok.TokType == TokType: getTok(p) if p.tok.TokType == TokType: getTok(p)

1
todo.txt
View file

@ -46,7 +46,6 @@ version 0.9.XX
- generalized case statement (requires better transf) - generalized case statement (requires better transf)
- tlastmod returns wrong results on BSD (Linux, MacOS X: works) - tlastmod returns wrong results on BSD (Linux, MacOS X: works)
- nested tuple unpacking - nested tuple unpacking
- better error messages for used keywords as identifiers
- case statement branches should support constant sets - case statement branches should support constant sets
- 'nimrod def': does not always work - 'nimrod def': does not always work
- test branch coverage - test branch coverage