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

fixes #3730

Browse source
This commit is contained in:
Araq 2016-01-18 13:48:58 +01:00
commit 38da21fc62
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/lambdalifting.nim
View file

@ -213,7 +213,7 @@ proc makeClosure*(prc: PSym; env: PNode; info: TLineInfo): PNode =
if env == nil:
result.add(newNodeIT(nkNilLit, info, getSysType(tyNil)))
else:
if env.kind == nkClosure:
if env.skipConv.kind == nkClosure:
localError(info, "internal error: taking closure of closure")
result.add(env)
@ -711,7 +711,11 @@ proc liftCapturedVars(n: PNode; owner: PSym; d: DetectionPass;
of nkClosure:
if n[1].kind == nkNilLit:
n.sons[0] = liftCapturedVars(n[0], owner, d, c)
#if n.sons[0].kind == nkClosure: result = n.sons[0]
let x = n.sons[0].skipConv
if x.kind == nkClosure:
#localError(n.info, "internal error: closure to closure created")
# now we know better, so patch it:
n.sons[0] = x.sons[0]
of nkLambdaKinds, nkIteratorDef:
if n.typ != nil and n[namePos].kind == nkSym:
let m = newSymNode(n[namePos].sym)