From 87ae863c3efa7ce41fed81b783855c572d541898 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Wed, 10 Apr 2013 15:19:13 +0200 Subject: Re-organized comparisons of types with classes. New methods: isClassType, derivesFrom, isArray. Refactored calls to typeSymbol and <:< into these. Made sure to use dealias where needed on remaining typeSymbol calls. --- src/dotty/tools/dotc/core/TypeOps.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/dotty/tools/dotc/core/TypeOps.scala') diff --git a/src/dotty/tools/dotc/core/TypeOps.scala b/src/dotty/tools/dotc/core/TypeOps.scala index 45bd6a9f9..d3cfaba69 100644 --- a/src/dotty/tools/dotc/core/TypeOps.scala +++ b/src/dotty/tools/dotc/core/TypeOps.scala @@ -11,7 +11,7 @@ trait TypeOps { this: Context => def toPrefix(pre: Type, cls: Symbol, thiscls: ClassSymbol): Type = ctx.debugTraceIndented(s"toPrefix($pre, $cls, $thiscls)") { if ((pre eq NoType) || (pre eq NoPrefix) || (cls is PackageClass)) tp - else if (thiscls.isNonBottomSubClass(cls) && pre.baseType(thiscls).exists) + else if (thiscls.derivesFrom(cls) && pre.baseType(thiscls).exists) pre match { case SuperType(thispre, _) => thispre case _ => pre -- cgit v1.2.3