mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-02-16 16:14:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

and another closure bugfix

Browse Source
This commit is contained in:
Araq
2012-06-21 09:03:49 +02:00
parent 7b4560337b
commit 2294c02cc8
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/lambdalifting.nim
View File

@@ -302,7 +302,7 @@ proc transformInnerProc(o: POuterContext, i: PInnerContext, n: PNode): PNode =
let s = n.sym
if s == i.fn:
# recursive calls go through (lambda, hiddenParam):
assert i.closureParam != nil
assert i.closureParam != nil, i.fn.name.s
result = makeClosure(s, i.closureParam, n.info)
elif isInnerProc(s, o.fn) and s.typ.callConv == ccClosure:
# ugh: call to some other inner proc;
@@ -340,8 +340,10 @@ proc searchForInnerProcs(o: POuterContext, n: PNode) =
# dummy closure param needed?
if inner.closureParam == nil and n.sym.typ.callConv == ccClosure:
dummyClosureParam(o, inner)
let ti = transformInnerProc(o, inner, body)
if ti != nil: n.sym.ast.sons[bodyPos] = ti
# only transform if it really needs a closure:
if inner.closureParam != nil:
let ti = transformInnerProc(o, inner, body)
if ti != nil: n.sym.ast.sons[bodyPos] = ti
of nkLambdaKinds:
searchForInnerProcs(o, n.sons[namePos])
of nkWhileStmt, nkForStmt, nkParForStmt, nkBlockStmt: