diff options
| author | Guillaume Martres <smarter@ubuntu.com> | 2015-10-25 17:50:35 +0100 |
|---|---|---|
| committer | Guillaume Martres <smarter@ubuntu.com> | 2015-10-25 17:50:35 +0100 |
| commit | 51ab200f97f11ac74270f6925028ba4d58284e7b (patch) | |
| tree | 90b86a23c2713754a21d7f030ecf3205a151e014 | |
| parent | 08df804a5b4b7289a1518aa5ccf9753ec1a8cd7a (diff) | |
| parent | 7947a7b0fc818128f5e2a0cd10cc43d2d7614354 (diff) | |
| download | dotty-51ab200f97f11ac74270f6925028ba4d58284e7b.tar.gz dotty-51ab200f97f11ac74270f6925028ba4d58284e7b.tar.bz2 dotty-51ab200f97f11ac74270f6925028ba4d58284e7b.zip | |
Merge pull request #865 from dotty-staging/fix-module-alias-subtyping
Fix hole in subtyping of modules
| -rw-r--r-- | src/dotty/tools/dotc/core/TypeComparer.scala | 13 | ||||
| -rw-r--r-- | tests/pos/range.scala | 9 |
2 files changed, 18 insertions, 4 deletions
diff --git a/src/dotty/tools/dotc/core/TypeComparer.scala b/src/dotty/tools/dotc/core/TypeComparer.scala index 1afaed60d..684e9cbfd 100644 --- a/src/dotty/tools/dotc/core/TypeComparer.scala +++ b/src/dotty/tools/dotc/core/TypeComparer.scala @@ -197,8 +197,10 @@ class TypeComparer(initctx: Context) extends DotClass with ConstraintHandling { val cls1 = tp1.cls cls1.classInfo.selfType.derivesFrom(cls2) && cls2.classInfo.selfType.derivesFrom(cls1) - case tp1: TermRef if tp2.cls eq tp1.symbol.moduleClass => - isSubType(tp1.prefix, cls2.owner.thisType) + case tp1: TermRef if cls2.is(Module) && cls2.eq(tp1.widen.typeSymbol) => + cls2.isStaticOwner || + isSubType(tp1.prefix, cls2.owner.thisType) || + secondTry(tp1, tp2) case _ => secondTry(tp1, tp2) } @@ -257,9 +259,12 @@ class TypeComparer(initctx: Context) extends DotClass with ConstraintHandling { } comparePolyParam case tp1: ThisType => + val cls1 = tp1.cls tp2 match { - case tp2: TermRef if tp1.cls eq tp2.symbol.moduleClass => - isSubType(tp1.cls.owner.thisType, tp2.prefix) + case tp2: TermRef if cls1.is(Module) && cls1.eq(tp2.widen.typeSymbol) => + cls1.isStaticOwner || + isSubType(cls1.owner.thisType, tp2.prefix) || + thirdTry(tp1, tp2) case _ => thirdTry(tp1, tp2) } diff --git a/tests/pos/range.scala b/tests/pos/range.scala new file mode 100644 index 000000000..9e7b5d1c9 --- /dev/null +++ b/tests/pos/range.scala @@ -0,0 +1,9 @@ +import scala.math._ +import collection.immutable.NumericRange +object Test { + val r1: scala.collection.immutable.Range.Partial = ??? + val r2: scala.Range.Partial = r1 + def until(d: BigDecimal, end: BigDecimal): Range.Partial[BigDecimal, NumericRange.Exclusive[BigDecimal]] = + new Range.Partial(until(d, end, _)) + def until(d: BigDecimal, end: BigDecimal, step: BigDecimal) = Range.BigDecimal(d, end, step) +} |