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
title='Blame the previous revision' href='/andinus/cetus/blame/cmd/cetus-nasa/cetus-nasa.go?h=v0.6.7&id=3d25dff251cde9fad0582fd31e2ad4b95bec0288'>^
50871fc ^






5ea5932 ^

50871fc ^






c1e489f ^
50871fc ^




a5ff830 ^


d282ab6 ^
a5ff830 ^


50871fc ^
a5ff830 ^
50871fc ^



ddbef09 ^
50871fc ^
ddbef09 ^


50871fc ^
3326769 ^
50871fc ^


ddbef09 ^

50871fc ^





a5ff830 ^

c1e489f ^


3326769 ^
fc1600f ^
3326769 ^

a5ff830 ^



f69c528 ^


944222f ^
f69c528 ^
a5ff830 ^

5ea5932 ^

d282ab6 ^
5ea5932 ^








1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138