mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-04-18 21:40:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

should fix newly introduced bugs wrt TR macros

Browse Source
This commit is contained in:
Araq
2013-09-18 02:03:56 +02:00
parent 9de3bc8ef6
commit 51672aef72
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/hlo.nim
View File

@@ -47,7 +47,7 @@ proc applyPatterns(c: PContext, n: PNode): PNode =
if evalTemplateCounter > 100:
GlobalError(n.info, errTemplateInstantiationTooNested)
# deactivate this pattern:
#c.patterns[i] = nil
c.patterns[i] = nil
if x.kind == nkStmtList:
assert x.len == 3
x.sons[1] = evalPattern(c, x.sons[1], result)
@@ -56,17 +56,21 @@ proc applyPatterns(c: PContext, n: PNode): PNode =
result = evalPattern(c, x, result)
dec(evalTemplateCounter)
# activate this pattern again:
#c.patterns[i] = pattern
c.patterns[i] = pattern
proc hlo(c: PContext, n: PNode): PNode =
inc(c.hloLoopDetector)
# simply stop and do not perform any further transformations:
if c.hloLoopDetector > 300: result = n
if c.hloLoopDetector > 300: return n
case n.kind
of nkMacroDef, nkTemplateDef, procDefs:
# already processed (special cases in semstmts.nim)
result = n
else:
if n.kind in {nkFastAsgn, nkAsgn, nkIdentDefs, nkVarTuple} and
n.sons[0].kind == nkSym and sfGlobal in n.sons[0].sym.flags:
# do not optimize 'var g {.global} = re(...)' again!
return n
result = applyPatterns(c, n)
if result == n:
# no optimization applied, try subtrees: