Skip to content

Commit 4b476c9

Browse files
committed
More underlying -> supertype conversions in Types
1 parent a536955 commit 4b476c9

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

compiler/src/dotty/tools/dotc/core/Types.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ object Types {
618618
case tp: ClassInfo =>
619619
tp.decls
620620
case tp: TypeProxy =>
621-
tp.underlying.decls
621+
tp.superType.decls
622622
case _ =>
623623
EmptyScope
624624
}
@@ -644,7 +644,7 @@ object Types {
644644
case tp: ClassInfo =>
645645
tp.decls.denotsNamed(name).filterWithFlags(EmptyFlags, excluded).toDenot(NoPrefix)
646646
case tp: TypeProxy =>
647-
tp.underlying.findDecl(name, excluded)
647+
tp.superType.findDecl(name, excluded)
648648
case err: ErrorType =>
649649
newErrorSymbol(classSymbol orElse defn.RootClass, name, err.msg)
650650
case _ =>
@@ -888,7 +888,7 @@ object Types {
888888
def showPrefixSafely(pre: Type)(using Context): String = pre.stripTypeVar match {
889889
case pre: TermRef => i"${pre.symbol.name}."
890890
case pre: TypeRef => i"${pre.symbol.name}#"
891-
case pre: TypeProxy => showPrefixSafely(pre.underlying)
891+
case pre: TypeProxy => showPrefixSafely(pre.superType)
892892
case _ => if (pre.typeSymbol.exists) i"${pre.typeSymbol.name}#" else "."
893893
}
894894

@@ -915,7 +915,7 @@ object Types {
915915
val ns = tp.parent.memberNames(keepOnly, pre)
916916
if (keepOnly(pre, tp.refinedName)) ns + tp.refinedName else ns
917917
case tp: TypeProxy =>
918-
tp.underlying.memberNames(keepOnly, pre)
918+
tp.superType.memberNames(keepOnly, pre)
919919
case tp: AndType =>
920920
tp.tp1.memberNames(keepOnly, pre) | tp.tp2.memberNames(keepOnly, pre)
921921
case tp: OrType =>
@@ -1371,7 +1371,7 @@ object Types {
13711371
// which ensures that `X$ <:< X.type` returns true.
13721372
single(tp.symbol.companionModule.termRef.asSeenFrom(tp.prefix, tp.symbol.owner))
13731373
case tp: TypeProxy =>
1374-
tp.underlying.atoms match
1374+
tp.superType.atoms match
13751375
case Atoms.Range(_, hi) => Atoms.Range(Set.empty, hi)
13761376
case Atoms.Unknown => Atoms.Unknown
13771377
case _ => Atoms.Unknown
@@ -1615,7 +1615,7 @@ object Types {
16151615
case tp: ClassInfo =>
16161616
tp.prefix
16171617
case tp: TypeProxy =>
1618-
tp.underlying.normalizedPrefix
1618+
tp.superType.normalizedPrefix
16191619
case _ =>
16201620
NoType
16211621
}

0 commit comments

Comments
 (0)