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

make pragma expression parsing use the same parser mechanism as elsewhere

Browse source
This commit is contained in:
Andreas Rumpf 2017-03-31 17:03:15 +02:00
commit d7eb146d28
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/parser.nim
View file

@ -287,7 +287,7 @@ proc checkBinary(p: TParser) {.inline.} =
#| optInd = COMMENT? #| optInd = COMMENT?
#| optPar = (IND{>} | IND{=})? #| optPar = (IND{>} | IND{=})?
#| #|
#| simpleExpr = arrowExpr (OP0 optInd arrowExpr)* #| simpleExpr = arrowExpr (OP0 optInd arrowExpr)* pragma?
#| arrowExpr = assignExpr (OP1 optInd assignExpr)* #| arrowExpr = assignExpr (OP1 optInd assignExpr)*
#| assignExpr = orExpr (OP2 optInd orExpr)* #| assignExpr = orExpr (OP2 optInd orExpr)*
#| orExpr = andExpr (OP3 optInd andExpr)* #| orExpr = andExpr (OP3 optInd andExpr)*
@ -771,8 +771,7 @@ proc parseOperators(p: var TParser, headNode: PNode,
proc simpleExprAux(p: var TParser, limit: int, mode: TPrimaryMode): PNode = proc simpleExprAux(p: var TParser, limit: int, mode: TPrimaryMode): PNode =
result = primary(p, mode) result = primary(p, mode)
if p.tok.tokType == tkCurlyDotLe and if p.tok.tokType == tkCurlyDotLe and (p.tok.indent < 0 or realInd(p)) and
p.lex.lineNumber == result.info.line and
mode == pmNormal: mode == pmNormal:
var pragmaExp = newNodeP(nkPragmaExpr, p) var pragmaExp = newNodeP(nkPragmaExpr, p)
pragmaExp.addSon result pragmaExp.addSon result