Skip to content

Commit 5731ee4

Browse files
committed
Rename more ctx fields
1 parent f3eb86c commit 5731ee4

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

compiler/src/dotty/tools/dotc/typer/Namer.scala

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,7 +1027,7 @@ class Namer { typer: Typer =>
10271027
class ClassCompleter(cls: ClassSymbol, original: TypeDef)(ictx: Context) extends Completer(original)(ictx) {
10281028
withDecls(newScope)
10291029

1030-
protected implicit val ctx: Context = localContext(cls)
1030+
protected implicit val completerCtx: Context = localContext(cls)
10311031

10321032
private var localCtx: Context = _
10331033

@@ -1179,23 +1179,23 @@ class Namer { typer: Typer =>
11791179
val moduleType = cls.owner.thisType select sourceModule
11801180
if (self.name == nme.WILDCARD) moduleType
11811181
else recordSym(
1182-
ctx.newSymbol(cls, self.name, self.mods.flags, moduleType, coord = self.span),
1182+
completerCtx.newSymbol(cls, self.name, self.mods.flags, moduleType, coord = self.span),
11831183
self)
11841184
}
11851185
else createSymbol(self)
11861186

11871187
val savedInfo = denot.infoOrCompleter
11881188
denot.info = new TempClassInfo(cls.owner.thisType, cls, decls, selfInfo)
11891189

1190-
localCtx = ctx.inClassContext(selfInfo)
1190+
localCtx = completerCtx.inClassContext(selfInfo)
11911191

11921192
index(constr)
11931193
index(rest)(localCtx)
11941194

11951195
symbolOfTree(constr).info.stripPoly match // Completes constr symbol as a side effect
11961196
case mt: MethodType if cls.is(Case) && mt.isParamDependent =>
11971197
// See issue #8073 for background
1198-
ctx.error(
1198+
completerCtx.error(
11991199
i"""Implementation restriction: case classes cannot have dependencies between parameters""",
12001200
cls.sourcePos)
12011201
case _ =>
@@ -1241,28 +1241,28 @@ class Namer { typer: Typer =>
12411241
* (4) If the class is sealed, it is defined in the same compilation unit as the current class
12421242
*/
12431243
def checkedParentType(parent: untpd.Tree): Type = {
1244-
val ptype = parentType(parent)(ctx.superCallContext).dealiasKeepAnnots
1244+
val ptype = parentType(parent)(completerCtx.superCallContext).dealiasKeepAnnots
12451245
if (cls.isRefinementClass) ptype
12461246
else {
12471247
val pt = checkClassType(ptype, parent.sourcePos,
12481248
traitReq = parent ne parents.head, stablePrefixReq = true)
12491249
if (pt.derivesFrom(cls)) {
12501250
val addendum = parent match {
1251-
case Select(qual: Super, _) if ctx.scala2CompatMode =>
1251+
case Select(qual: Super, _) if completerCtx.scala2CompatMode =>
12521252
"\n(Note that inheriting a class of the same name is no longer allowed)"
12531253
case _ => ""
12541254
}
1255-
ctx.error(CyclicInheritance(cls, addendum), parent.sourcePos)
1255+
completerCtx.error(CyclicInheritance(cls, addendum), parent.sourcePos)
12561256
defn.ObjectType
12571257
}
12581258
else {
12591259
val pclazz = pt.typeSymbol
12601260
if pclazz.is(Final) then
1261-
ctx.error(ExtendFinalClass(cls, pclazz), cls.sourcePos)
1261+
completerCtx.error(ExtendFinalClass(cls, pclazz), cls.sourcePos)
12621262
else if pclazz.isEffectivelySealed && pclazz.associatedFile != cls.associatedFile then
12631263
if pclazz.is(Sealed) then
1264-
ctx.error(UnableToExtendSealedClass(pclazz), cls.sourcePos)
1265-
else if ctx.settings.strict.value then
1264+
completerCtx.error(UnableToExtendSealedClass(pclazz), cls.sourcePos)
1265+
else if completerCtx.settings.strict.value then
12661266
checkFeature(nme.adhocExtensions,
12671267
i"Unless $pclazz is declared 'open', its extension in a separate file",
12681268
cls.topLevelClass,

0 commit comments

Comments
 (0)