summaryrefslogtreecommitdiff
path: root/test/files/run
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2013-03-27 22:46:23 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2013-03-27 22:46:23 -0700
commit66fb8118f9c48c6be703e4e89aaaf8e76e430d5a (patch)
tree3ff5955b14d84ece8b3b6d506f12b61a9a72ed78 /test/files/run
parentf2a74c5ebda2a6d3438203572059a4cee509002d (diff)
parentdd89b006218d76a74d0185392d5e427c0867a33c (diff)
downloadscala-66fb8118f9c48c6be703e4e89aaaf8e76e430d5a.tar.gz
scala-66fb8118f9c48c6be703e4e89aaaf8e76e430d5a.tar.bz2
scala-66fb8118f9c48c6be703e4e89aaaf8e76e430d5a.zip
Merge pull request #2292 from retronym/ticket/7285
SI-7285 Fix match analysis with nested objects
Diffstat (limited to 'test/files/run')
-rw-r--r--test/files/run/t6146b.check11
-rw-r--r--test/files/run/t6146b.scala3
2 files changed, 11 insertions, 3 deletions
diff --git a/test/files/run/t6146b.check b/test/files/run/t6146b.check
index b664d1152a..49ff70697e 100644
--- a/test/files/run/t6146b.check
+++ b/test/files/run/t6146b.check
@@ -37,8 +37,15 @@ memType: (sub: u.Type, scrut: u.Type)u.Type
scala>
-scala> memType(S1, fTpe)
-res0: u.Type = O.X.S1.type
+scala> val mt1 = memType(S1, fTpe)
+mt1: u.Type = O.X.S1.type
+
+scala> global.typeDeconstruct.show(mt1)
+res0: String =
+TypeRef(
+ pre = SingleType(pre = ThisType(object O), object X)
+ TypeSymbol(class S1 extends C.this.F[T])
+)
scala> memType(S2, fTpe)
res1: u.Type = O.S2
diff --git a/test/files/run/t6146b.scala b/test/files/run/t6146b.scala
index adcd40d2ee..e63709aa9d 100644
--- a/test/files/run/t6146b.scala
+++ b/test/files/run/t6146b.scala
@@ -31,7 +31,8 @@ val fTpe = typeOf[O.type].decl(newTermName("foo")).paramss.head.head.tpe
def memType(sub: Type, scrut: Type): Type =
nestedMemberType(sub.typeSymbol, scrut.prefix, scrut.typeSymbol.owner)
-memType(S1, fTpe)
+val mt1 = memType(S1, fTpe)
+global.typeDeconstruct.show(mt1)
memType(S2, fTpe)
memType(S3, fTpe)
memType(S4, fTpe)