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

more bugfixes for closures

Browse source
This commit is contained in:
Araq 2012-08-14 07:53:16 +02:00
commit 5e570bae47
3 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/lambdalifting.nim
View file

@ -236,7 +236,8 @@ proc dummyClosureParam(o: POuterContext, i: PInnerContext) =
if i.closureParam == nil: addClosureParam(i, e)
proc illegalCapture(s: PSym): bool {.inline.} =
result = skipTypes(s.typ, abstractInst).kind in {tyVar, tyOpenArray} or
result = skipTypes(s.typ, abstractInst).kind in
{tyVar, tyOpenArray, tyVarargs} or
s.kind == skResult
proc captureVar(o: POuterContext, i: PInnerContext, local: PSym,
@ -246,7 +247,8 @@ proc captureVar(o: POuterContext, i: PInnerContext, local: PSym,
var it = PEnv(IdTableGet(o.localsToEnv, local))
if it == nil: return
if illegalCapture(local) or o.fn.id != local.owner.id:
if illegalCapture(local) or o.fn.id != local.owner.id or
i.fn.typ.callConv notin {ccClosure, ccDefault}:
# Currently captures are restricted to a single level of nesting:
LocalError(info, errIllegalCaptureX, local.name.s)
i.fn.typ.callConv = ccClosure
@ -280,7 +282,7 @@ proc interestingVar(s: PSym): bool {.inline.} =
proc semCaptureSym*(s, owner: PSym) =
if interestingVar(s) and owner.id != s.owner.id:
if owner.typ != nil:
if owner.typ != nil and not isGenericRoutine(owner):
owner.typ.callConv = ccClosure
# since the analysis is not entirely correct, we don't set 'tfCapturesEnv'
# here