Skip to content

Commit 11090f1

Browse files
committed
hasOuterParam -> needsOuterParam
1 parent b4fb9b0 commit 11090f1

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

compiler/src/dotty/tools/dotc/transform/Erasure.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -931,7 +931,7 @@ object Erasure {
931931

932932
/** The outer parameter definition of a constructor if it needs one */
933933
private def outerParamDefs(constr: Symbol)(using Context): List[ValDef] =
934-
if constr.isConstructor && hasOuterParam(constr.owner.asClass) then
934+
if constr.isConstructor && needsOuterParam(constr.owner.asClass) then
935935
constr.info match
936936
case MethodTpe(outerName :: _, outerType :: _, _) =>
937937
val outerSym = newSymbol(constr, outerName, Flags.Param, outerType)

compiler/src/dotty/tools/dotc/transform/ExplicitOuter.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,8 @@ object ExplicitOuter {
245245
private def hasOuter(cls: ClassSymbol)(using Context): Boolean =
246246
needsOuterIfReferenced(cls) && outerAccessor(cls).exists
247247

248-
/** Class constructor takes an outer argument. Can be called only after phase ExplicitOuter. */
249-
def hasOuterParam(cls: ClassSymbol)(using Context): Boolean =
248+
/** Class constructor needs an outer argument. Can be called only after phase ExplicitOuter. */
249+
def needsOuterParam(cls: ClassSymbol)(using Context): Boolean =
250250
!cls.is(Trait) && needsOuterAlways(cls)
251251

252252
/** Tree references an outer class of `cls` which is not a static owner.
@@ -357,7 +357,7 @@ object ExplicitOuter {
357357

358358
/** If `cls` has an outer parameter add one to the method type `tp`. */
359359
def addParam(cls: ClassSymbol, tp: Type): Type =
360-
if (hasOuterParam(cls)) {
360+
if (needsOuterParam(cls)) {
361361
val mt @ MethodTpe(pnames, ptypes, restpe) = tp
362362
mt.derivedLambdaType(
363363
nme.OUTER :: pnames, outerClass(cls).typeRef :: ptypes, restpe)
@@ -378,7 +378,7 @@ object ExplicitOuter {
378378
case TypeApply(Select(r, nme.asInstanceOf_), args) =>
379379
outerArg(r) // cast was inserted, skip
380380
}
381-
if (hasOuterParam(cls))
381+
if (needsOuterParam(cls))
382382
methPart(fun) match {
383383
case Select(receiver, _) => outerArg(receiver).withSpan(fun.span) :: Nil
384384
}
@@ -390,7 +390,7 @@ object ExplicitOuter {
390390
* argument, the singleton list with the argument, otherwise Nil.
391391
*/
392392
def argsForNew(cls: ClassSymbol, tpe: Type): List[Tree] =
393-
if (hasOuterParam(cls)) singleton(fixThis(outerPrefix(tpe))) :: Nil
393+
if (needsOuterParam(cls)) singleton(fixThis(outerPrefix(tpe))) :: Nil
394394
else Nil
395395

396396
/** A path of outer accessors starting from node `start`. `start` defaults to the

0 commit comments

Comments
 (0)