From 264cef8f9677c59395166da9be0af0bfe83abfa5 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Thu, 3 May 2012 12:05:58 -0700 Subject: Test cases for SI-5472, SI-5399, SI-5685. --- test/pending/pos/t5399.scala | 15 ++++----------- test/pending/pos/t5399a.scala | 19 +++++++++++++++++++ test/pending/pos/t5685.scala | 23 +++++++++++++++++++++++ test/pending/pos/t5685b.scala | 23 +++++++++++++++++++++++ 4 files changed, 69 insertions(+), 11 deletions(-) create mode 100644 test/pending/pos/t5399a.scala create mode 100644 test/pending/pos/t5685.scala create mode 100644 test/pending/pos/t5685b.scala (limited to 'test/pending') diff --git a/test/pending/pos/t5399.scala b/test/pending/pos/t5399.scala index d8c1d5e51c..89caba39c1 100644 --- a/test/pending/pos/t5399.scala +++ b/test/pending/pos/t5399.scala @@ -1,15 +1,8 @@ class Test { - type AnyCyclic = Execute[Task]#CyclicException[_] + class A[T] + class B[T](val a: A[T]) - trait Task[T] + case class CaseClass[T](x: T) - trait Execute[A[_] <: AnyRef] { - class CyclicException[T](val caller: A[T], val target: A[T]) - } - - def convertCyclic(c: AnyCyclic): String = - (c.caller, c.target) match { - case (caller: Task[_], target: Task[_]) => "bazinga!" - } + def break(existB: B[_]) = CaseClass(existB.a) match { case CaseClass(_) => } } - diff --git a/test/pending/pos/t5399a.scala b/test/pending/pos/t5399a.scala new file mode 100644 index 0000000000..4ebd85ad03 --- /dev/null +++ b/test/pending/pos/t5399a.scala @@ -0,0 +1,19 @@ +class Foo { + trait Init[T] + class ScopedKey[T] extends Init[T] + + trait Setting[T] { + val key: ScopedKey[T] + } + + case class ScopedKey1[T](val foo: Init[T]) extends ScopedKey[T] + + val scalaHome: Setting[Option[String]] = null + val scalaVersion: Setting[String] = null + + def testPatternMatch(s: Setting[_]) { + s.key match { + case ScopedKey1(scalaHome.key | scalaVersion.key) => () + } + } +} diff --git a/test/pending/pos/t5685.scala b/test/pending/pos/t5685.scala new file mode 100644 index 0000000000..9ac42a174e --- /dev/null +++ b/test/pending/pos/t5685.scala @@ -0,0 +1,23 @@ +trait X[A] { + def x: A +} + +trait XPrint[A] extends X[A] { + abstract override def x: A = { + val a = super.x + println(a) + a + } +} + +trait F[A, B] { outer => + def apply(xv: X[A]): X[B] + + def andThen[C](f: F[B, C]): F[A, C] = new F[A, C] { + def apply(xv: X[A]): X[C] = f(new XX(xv) with XPrint[B]) + } + + class XX(xv: X[A]) extends X[B] { + def x = outer(xv).x + } +} diff --git a/test/pending/pos/t5685b.scala b/test/pending/pos/t5685b.scala new file mode 100644 index 0000000000..18ff803f89 --- /dev/null +++ b/test/pending/pos/t5685b.scala @@ -0,0 +1,23 @@ +trait X[+A] { + def x: A +} + +trait XPrint[+A] extends X[A] { + abstract override def x: A = { + val a = super.x + println(a) + a + } +} + +trait F[-A, +B] { outer => + def apply(xv: X[A]): X[B] + + def andThen[C](f: F[B, C]): F[A, C] = new F[A, C] { + def apply(xv: X[A]): X[C] = f(new XX(xv) with XPrint[B]) + } + + class XX(xv: X[A]) extends X[B] { + def x = outer(xv).x + } +} -- cgit v1.2.3