@@ -212,7 +212,7 @@ class CheckCaptures extends Recheck, SymTransformer:
212
212
report.error(i " $header included in allowed capture set ${res.blocking}" , pos)
213
213
214
214
/** The current environment */
215
- private var curEnv : Env = Env (NoSymbol , false , CaptureSet .empty, isBoxed = false , null )
215
+ private var curEnv : Env = Env (NoSymbol , nestedInOwner = false , CaptureSet .empty, isBoxed = false , null )
216
216
217
217
private val myCapturedVars : util.EqHashMap [Symbol , CaptureSet ] = EqHashMap ()
218
218
@@ -451,7 +451,7 @@ class CheckCaptures extends Recheck, SymTransformer:
451
451
if ! Synthetics .isExcluded(sym) then
452
452
val saved = curEnv
453
453
val localSet = capturedVars(sym)
454
- if ! localSet.isAlwaysEmpty then curEnv = Env (sym, false , localSet, isBoxed = false , curEnv)
454
+ if ! localSet.isAlwaysEmpty then curEnv = Env (sym, nestedInOwner = false , localSet, isBoxed = false , curEnv)
455
455
try super .recheckDefDef(tree, sym)
456
456
finally
457
457
interpolateVarsIn(tree.tpt)
@@ -467,7 +467,7 @@ class CheckCaptures extends Recheck, SymTransformer:
467
467
val localSet = capturedVars(cls)
468
468
for parent <- impl.parents do // (1)
469
469
checkSubset(capturedVars(parent.tpe.classSymbol), localSet, parent.srcPos)
470
- if ! localSet.isAlwaysEmpty then curEnv = Env (cls, false , localSet, isBoxed = false , curEnv)
470
+ if ! localSet.isAlwaysEmpty then curEnv = Env (cls, nestedInOwner = false , localSet, isBoxed = false , curEnv)
471
471
try
472
472
val thisSet = cls.classInfo.selfType.captureSet.withDescription(i " of the self type of $cls" )
473
473
checkSubset(localSet, thisSet, tree.srcPos) // (2)
@@ -514,7 +514,7 @@ class CheckCaptures extends Recheck, SymTransformer:
514
514
override def recheck (tree : Tree , pt : Type = WildcardType )(using Context ): Type =
515
515
if tree.isTerm && pt.isBoxedCapturing then
516
516
val saved = curEnv
517
- curEnv = Env (curEnv.owner, false , CaptureSet .Var (), isBoxed = true , curEnv)
517
+ curEnv = Env (curEnv.owner, nestedInOwner = false , CaptureSet .Var (), isBoxed = true , curEnv)
518
518
try super .recheck(tree, pt)
519
519
finally curEnv = saved
520
520
else
@@ -613,7 +613,7 @@ class CheckCaptures extends Recheck, SymTransformer:
613
613
covariant : Boolean , boxed : Boolean ,
614
614
reconstruct : (List [Type ], Type ) => Type ): (Type , CaptureSet ) =
615
615
val saved = curEnv
616
- curEnv = Env (curEnv.owner, true , CaptureSet .Var (), isBoxed = false , if boxed then null else curEnv)
616
+ curEnv = Env (curEnv.owner, nestedInOwner = true , CaptureSet .Var (), isBoxed = false , if boxed then null else curEnv)
617
617
618
618
try
619
619
val (eargs, eres) = expected.dealias match
@@ -643,7 +643,7 @@ class CheckCaptures extends Recheck, SymTransformer:
643
643
covariant : Boolean , boxed : Boolean ,
644
644
reconstruct : Type => Type ): (Type , CaptureSet ) =
645
645
val saved = curEnv
646
- curEnv = Env (curEnv.owner, true , CaptureSet .Var (), isBoxed = false , if boxed then null else curEnv)
646
+ curEnv = Env (curEnv.owner, nestedInOwner = true , CaptureSet .Var (), isBoxed = false , if boxed then null else curEnv)
647
647
648
648
try
649
649
val eres = expected.dealias.stripCapturing match
0 commit comments