diff options
author | Araq <rumpf_a@web.de> | 2011-06-19 16:22:39 +0200 |
---|---|---|
committer | Araq <rumpf_a@web.de> | 2011-06-19 16:22:39 +0200 |
commit | 54021471e40d2cc2ff8f178192ba83873e7f43e0 (patch) | |
tree | e4f3090fbf81f34a580df15d9adab639a8d7f769 /compiler/parser.nim | |
parent | d608e4d11589c7edcace93b731984b67cb26e2d1 (diff) | |
download | Nim-54021471e40d2cc2ff8f178192ba83873e7f43e0.tar.gz |
nicer error messages for used keywords as identifiers
Diffstat (limited to 'compiler/parser.nim')
-rwxr-xr-x | compiler/parser.nim | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/parser.nim b/compiler/parser.nim index 677aa57ba..42dc0b64b 100755 --- a/compiler/parser.nim +++ b/compiler/parser.nim @@ -69,7 +69,7 @@ proc parMessage(p: TParser, msg: TMsgKind, arg: string = "") = lexMessage(p.lex, msg, arg) 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) = if p.tok.tokType == tkComment: @@ -92,11 +92,11 @@ proc optInd(p: var TParser, n: PNode) = proc expectIdentOrKeyw(p: TParser) = 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) = 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) = if p.tok.TokType == TokType: getTok(p) |