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

closure iterators sometimes work

Browse source
This commit is contained in:
Andreas Rumpf 2015-12-30 00:47:15 +01:00
commit 9cc066d99d
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/lambdalifting.nim
View file

@ -359,7 +359,8 @@ proc detectCapturedVars(n: PNode; owner: PSym; c: var DetectionPass) =
# create required upFields: # create required upFields:
var w = owner.skipGenericOwner var w = owner.skipGenericOwner
if isInnerProc(w): if isInnerProc(w):
while w != nil and w.kind != skModule and ow != w: let last = if ow.isIterator: ow.skipGenericOwner else: ow
while w != nil and w.kind != skModule and last != w:
discard """ discard """
proc outer = proc outer =
var a, b: int var a, b: int
@ -413,7 +414,7 @@ proc accessViaEnvParam(n: PNode; owner: PSym): PNode =
let upField = lookupInRecord(obj.n, getIdent(upName)) let upField = lookupInRecord(obj.n, getIdent(upName))
if upField == nil: break if upField == nil: break
access = rawIndirectAccess(access, upField, n.info) access = rawIndirectAccess(access, upField, n.info)
localError(n.info, "internal error: no environment parameter set") localError(n.info, "internal error: environment misses: " & s.name.s)
result = n result = n
proc rawClosureCreation(env: PNode; owner: PSym; proc rawClosureCreation(env: PNode; owner: PSym;