diff options
author | Paul Phillips <paulp@improving.org> | 2013-09-18 07:25:59 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2013-09-18 07:25:59 -0700 |
commit | a8543ef28f8fc0152208f4eef763344657bf9e5a (patch) | |
tree | c82662e321ec6c291edbd51e30ff93bc6d93ce92 /test | |
parent | d45a3c8cc8e9f1d95d797d548a85abd8597f5bc7 (diff) | |
parent | 0f67e8dddcb8b087560fed90339d9235179dd1ea (diff) | |
download | scala-a8543ef28f8fc0152208f4eef763344657bf9e5a.tar.gz scala-a8543ef28f8fc0152208f4eef763344657bf9e5a.tar.bz2 scala-a8543ef28f8fc0152208f4eef763344657bf9e5a.zip |
Merge pull request #2955 from retronym/ticket/7853
SI-7853 Regression in explicit outer
Diffstat (limited to 'test')
-rw-r--r-- | test/files/pos/t4970b.scala | 32 | ||||
-rw-r--r-- | test/files/pos/t7853-partial-function.scala | 7 | ||||
-rw-r--r-- | test/files/pos/t7853.scala | 11 | ||||
-rw-r--r-- | test/files/run/compiler-asSeenFrom.check | 4 |
4 files changed, 52 insertions, 2 deletions
diff --git a/test/files/pos/t4970b.scala b/test/files/pos/t4970b.scala new file mode 100644 index 0000000000..cf9a6a6ae9 --- /dev/null +++ b/test/files/pos/t4970b.scala @@ -0,0 +1,32 @@ +object Traits { + trait OuterClass[V <: OuterClass[V]#InnerClass] { + trait InnerClass {self: V => + def method = () + } + } + + trait SubOuterClass[T <: SubOuterClass[T]#SubInnerClass] extends OuterClass[T] { + trait SubInnerClass extends super.InnerClass {self: T => } + } + + trait SubOuterClass2[T <: SubOuterClass2[T]#SubInnerClass2] extends OuterClass[T] { + trait SubInnerClass2 extends super.InnerClass {self: InnerClass with T => } + } + +} + +// object Classes { +// class OuterClass[V <: OuterClass[V]#InnerClass] { +// class InnerClass {self: V => +// def method = () +// } +// } + +// class SubOuterClass[T <: SubOuterClass[T]#SubInnerClass] extends OuterClass[T] { +// class SubInnerClass extends super.InnerClass {self: T => } +// } + +// class SubOuterClass2[T <: SubOuterClass2[T]#SubInnerClass2] extends OuterClass[T] { +// class SubInnerClass2 extends super.InnerClass {self: InnerClass with T => } +// } +// } diff --git a/test/files/pos/t7853-partial-function.scala b/test/files/pos/t7853-partial-function.scala new file mode 100644 index 0000000000..b09254e99a --- /dev/null +++ b/test/files/pos/t7853-partial-function.scala @@ -0,0 +1,7 @@ +object Test { + + def testCons: Unit = { + def x[A](a: PartialFunction[Any, A]): A = a(0) + val eval0 = x { case list: List[Int @unchecked] => list } + } +} diff --git a/test/files/pos/t7853.scala b/test/files/pos/t7853.scala new file mode 100644 index 0000000000..b0e9221e22 --- /dev/null +++ b/test/files/pos/t7853.scala @@ -0,0 +1,11 @@ +trait S { + trait T { + this: Any => + + trait U { + trait V { + S.this + } + } + } +} diff --git a/test/files/run/compiler-asSeenFrom.check b/test/files/run/compiler-asSeenFrom.check index a1826c2784..7305504115 100644 --- a/test/files/run/compiler-asSeenFrom.check +++ b/test/files/run/compiler-asSeenFrom.check @@ -363,8 +363,8 @@ value jZ { // after parser value jZ { // after explicitouter protected val $outer: D.this.type - val $outer(): ll.D[T3] - val $outer(): ll.C[T1] + val $outer(): D.this.type + val $outer(): C.this.type def thisI(): I.this.type def thisC(): C.this.type def t2(): T2 |