diff options
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/ast.nim | 2 | ||||
| -rw-r--r-- | compiler/parser.nim | 2 | ||||
| -rw-r--r-- | compiler/semexprs.nim | 5 | ||||
| -rw-r--r-- | compiler/semtempl.nim | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/compiler/ast.nim b/compiler/ast.nim index dd6f47ed1..0652bd3e7 100644 --- a/compiler/ast.nim +++ b/compiler/ast.nim @@ -1043,7 +1043,7 @@ proc discardSons(father: PNode) = father.sons = nil when defined(useNodeIds): - const nodeIdToDebug = 612777 # 612794 + const nodeIdToDebug* = 482228 # 612794 #612840 # 612905 # 614635 # 614637 # 614641 # 423408 #429107 # 430443 # 441048 # 441090 # 441153 diff --git a/compiler/parser.nim b/compiler/parser.nim index d59e013d7..07f5c9de9 100644 --- a/compiler/parser.nim +++ b/compiler/parser.nim @@ -525,6 +525,8 @@ proc parsePar(p: var TParser): PNode = asgn.sons[0] = a asgn.sons[1] = b result.add(asgn) + if p.tok.tokType == tkSemiColon: + semiStmtList(p, result) elif p.tok.tokType == tkSemiColon: # stmt context: result.add(a) diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim index 70c57b15e..1fd9075e8 100644 --- a/compiler/semexprs.nim +++ b/compiler/semexprs.nim @@ -1481,9 +1481,8 @@ proc processQuotations(n: var PNode, op: string, elif n.kind == nkAccQuoted and op == "``": returnQuote n[0] - if not n.isAtom: - for i in 0 .. <n.len: - processQuotations(n.sons[i], op, quotes, ids) + for i in 0 .. <n.safeLen: + processQuotations(n.sons[i], op, quotes, ids) proc semQuoteAst(c: PContext, n: PNode): PNode = internalAssert n.len == 2 or n.len == 3 diff --git a/compiler/semtempl.nim b/compiler/semtempl.nim index 363c5246f..407da8bdb 100644 --- a/compiler/semtempl.nim +++ b/compiler/semtempl.nim @@ -365,8 +365,6 @@ proc semTemplBody(c: var TemplCtx, n: PNode): PNode = result.sons[0] = semTemplBody(c, n.sons[0]) of nkPostfix: result.sons[1] = semTemplBody(c, n.sons[1]) - of nkPragma: - discard else: # dotExpr is ambiguous: note that we explicitely allow 'x.TemplateParam', # so we use the generic code for nkDotExpr too |