From 6b9359d90161887b2dc4fa12d9861883d22530f6 Mon Sep 17 00:00:00 2001 From: flaviut Date: Wed, 4 Jun 2014 15:40:31 -0400 Subject: [PATCH] updated grammer, fixed oversight --- compiler/parser.nim | 2 +- doc/grammar.txt | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/compiler/parser.nim b/compiler/parser.nim index ec829f6443..7b6ef8ee56 100644 --- a/compiler/parser.nim +++ b/compiler/parser.nim @@ -299,7 +299,7 @@ proc parseSymbol(p: var TParser, allowNil = false): PNode = var accm = "" while true: case p.tok.tokType - of tkAccent, tkEof: + of tkAccent: if accm == "": parMessage(p, errIdentifierExpected, p.tok) break diff --git a/doc/grammar.txt b/doc/grammar.txt index 63e898e110..61557b68c4 100644 --- a/doc/grammar.txt +++ b/doc/grammar.txt @@ -24,7 +24,7 @@ ampExpr = plusExpr (OP6 optInd plusExpr)* plusExpr = mulExpr (OP7 optInd mulExpr)* mulExpr = dollarExpr (OP8 optInd dollarExpr)* dollarExpr = primary (OP9 optInd primary)* -symbol = '`' (KEYW|IDENT|operator|'(' ')'|'[' ']'|'{' '}'|'='|literal)+ '`' +symbol = '`' (KEYW|IDENT|operator|'('|')'|'['|']'|'{'|'}'|'='|literal)+ '`' | IDENT indexExpr = expr indexExprList = indexExpr ^+ comma @@ -166,7 +166,6 @@ object = 'object' pragma? ('of' typeDesc)? COMMENT? objectPart typeClassParam = ('var')? symbol typeClass = typeClassParam ^* ',' (pragma)? ('of' typeDesc ^* ',')? &IND{>} stmt -distinct = 'distinct' optInd typeDesc typeDef = identWithPragma genericParamList? '=' optInd typeDefAux indAndComment? varTuple = '(' optInd identWithPragma ^+ comma optPar ')' '=' optInd expr