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

should fix newly introduced bugs wrt TR macros

Browse source
This commit is contained in:
Araq 2013-09-18 02:03:56 +02:00
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: if evalTemplateCounter > 100:
GlobalError(n.info, errTemplateInstantiationTooNested) GlobalError(n.info, errTemplateInstantiationTooNested)
# deactivate this pattern: # deactivate this pattern:
#c.patterns[i] = nil c.patterns[i] = nil
if x.kind == nkStmtList: if x.kind == nkStmtList:
assert x.len == 3 assert x.len == 3
x.sons[1] = evalPattern(c, x.sons[1], result) 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) result = evalPattern(c, x, result)
dec(evalTemplateCounter) dec(evalTemplateCounter)
# activate this pattern again: # activate this pattern again:
#c.patterns[i] = pattern c.patterns[i] = pattern
proc hlo(c: PContext, n: PNode): PNode = proc hlo(c: PContext, n: PNode): PNode =
inc(c.hloLoopDetector) inc(c.hloLoopDetector)
# simply stop and do not perform any further transformations: # simply stop and do not perform any further transformations:
if c.hloLoopDetector > 300: result = n if c.hloLoopDetector > 300: return n
case n.kind case n.kind
of nkMacroDef, nkTemplateDef, procDefs: of nkMacroDef, nkTemplateDef, procDefs:
# already processed (special cases in semstmts.nim) # already processed (special cases in semstmts.nim)
result = n result = n
else: 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) result = applyPatterns(c, n)
if result == n: if result == n:
# no optimization applied, try subtrees: # no optimization applied, try subtrees: