summary refs log tree commit diff stats
path: root/doc
diff options
context:
space:
mode:
authorAndreas Rumpf <rumpf_a@web.de>2014-06-08 22:00:26 +0200
committerAndreas Rumpf <rumpf_a@web.de>2014-06-08 22:00:26 +0200
commitee1bb2d5629f02b67b62934371ef29655868a69d (patch)
tree8c63f15e286c17208d2b9e774838d98a595f470f /doc
parent69a595480790d985f2d2f79d5d74bb6adb8568a7 (diff)
parent145cb3ae8ccf58495a3e38f6646041661de2affb (diff)
downloadNim-ee1bb2d5629f02b67b62934371ef29655868a69d.tar.gz
Merge pull request #1245 from flaviut/fix1217
Allow anything to go inside accents
Diffstat (limited to 'doc')
-rw-r--r--doc/grammar.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/grammar.txt b/doc/grammar.txt
index 63e898e11..fe5341840 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
@@ -82,6 +82,7 @@ paramListColon = paramList? (':' optInd typeDesc)?
 doBlock = 'do' paramListArrow pragmas? colcom stmt
 doBlocks = doBlock ^* IND{=}
 procExpr = 'proc' paramListColon pragmas? ('=' COMMENT? stmt)?
+distinct = 'distinct' optInd typeDesc
 expr = (ifExpr
       | whenExpr
       | caseExpr
@@ -166,7 +167,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