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

Fix casing in rule 'typeDesc' (#7324)

Browse source 
Also, leave a note in grammar.txt that it is generated.
This commit is contained in:
Robert Hencke 2018-03-12 04:27:36 -04:00 • committed by Andreas Rumpf
commit ac10a3813a
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/parser.nim
View file

@ -17,6 +17,8 @@
# In fact the grammar is generated from this file: # In fact the grammar is generated from this file:
when isMainModule: when isMainModule:
# Leave a note in grammar.txt that it is generated:
#| # This file is generated by compiler/parser.nim.
import pegs import pegs
var outp = open("doc/grammar.txt", fmWrite) var outp = open("doc/grammar.txt", fmWrite)
for line in lines("compiler/parser.nim"): for line in lines("compiler/parser.nim"):
@ -1675,7 +1677,7 @@ proc parseSection(p: var TParser, kind: TNodeKind,
parMessage(p, errIdentifierExpected, p.tok) parMessage(p, errIdentifierExpected, p.tok)
proc parseConstant(p: var TParser): PNode = proc parseConstant(p: var TParser): PNode =
#| constant = identWithPragma (colon typedesc)? '=' optInd expr indAndComment #| constant = identWithPragma (colon typeDesc)? '=' optInd expr indAndComment
result = newNodeP(nkConstDef, p) result = newNodeP(nkConstDef, p)
addSon(result, identWithPragma(p)) addSon(result, identWithPragma(p))
if p.tok.tokType == tkColon: if p.tok.tokType == tkColon:

3
doc/grammar.txt
View file

@ -1,3 +1,4 @@
# This file is generated by compiler/parser.nim.
module = stmt ^* (';' / IND{=}) module = stmt ^* (';' / IND{=})
comma = ',' COMMENT? comma = ',' COMMENT?
semicolon = ';' COMMENT? semicolon = ';' COMMENT?
@ -155,7 +156,7 @@ routine = optInd identVis pattern? genericParamList?
paramListColon pragma? ('=' COMMENT? stmt)? indAndComment paramListColon pragma? ('=' COMMENT? stmt)? indAndComment
commentStmt = COMMENT commentStmt = COMMENT
section(p) = COMMENT? p / (IND{>} (p / COMMENT)^+IND{=} DED) section(p) = COMMENT? p / (IND{>} (p / COMMENT)^+IND{=} DED)
constant = identWithPragma (colon typedesc)? '=' optInd expr indAndComment constant = identWithPragma (colon typeDesc)? '=' optInd expr indAndComment
enum = 'enum' optInd (symbol optInd ('=' optInd expr COMMENT?)? comma?)+ enum = 'enum' optInd (symbol optInd ('=' optInd expr COMMENT?)? comma?)+
objectWhen = 'when' expr colcom objectPart COMMENT? objectWhen = 'when' expr colcom objectPart COMMENT?
('elif' expr colcom objectPart COMMENT?)* ('elif' expr colcom objectPart COMMENT?)*