diff options
author | Martin Odersky <odersky@gmail.com> | 2014-11-17 17:08:26 +0100 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2014-11-17 17:08:42 +0100 |
commit | e63feffe063987df54cb9a5916003eb400c0b49d (patch) | |
tree | 2fa127537afdcdfaf0b6847232382c9c3b03275d | |
parent | a75b21b43962e809284f923741c0aa7a03499ab3 (diff) | |
download | dotty-e63feffe063987df54cb9a5916003eb400c0b49d.tar.gz dotty-e63feffe063987df54cb9a5916003eb400c0b49d.tar.bz2 dotty-e63feffe063987df54cb9a5916003eb400c0b49d.zip |
Moved pending tests that work into pos and neg.
One test (t2613) required lifting a hard recursion limit in findMember
(used for debug only, will be removed in the future). The same test
also requires -Yno-deep-subtypes to be reset, so it's in pos_special
instead of pos.
-rw-r--r-- | src/dotty/tools/dotc/core/Types.scala | 2 | ||||
-rw-r--r-- | test/dotc/tests.scala | 2 | ||||
-rw-r--r-- | tests/neg/boundspropagation.scala (renamed from tests/pending/pos/boundspropagation.scala) | 0 | ||||
-rw-r--r-- | tests/pending/pos/subtyping.scala | 12 | ||||
-rw-r--r-- | tests/pending/pos/tailcall/t1672.scala | 10 | ||||
-rw-r--r-- | tests/pending/pos/vararg-pattern.scala | 12 | ||||
-rw-r--r-- | tests/pos-special/t2613.scala (renamed from tests/pending/pos/t2613.scala) | 0 | ||||
-rw-r--r-- | tests/pos/t2795-new.scala (renamed from tests/pending/pos/t2795-new.scala) | 0 | ||||
-rw-r--r-- | tests/pos/t2795-old.scala (renamed from tests/pending/pos/t2795-old.scala) | 0 | ||||
-rw-r--r-- | tests/pos/t2945.scala (renamed from tests/pending/pos/t2945.scala) | 0 | ||||
-rw-r--r-- | tests/pos/tailcall/t1672.scala (renamed from tests/pending/pos/t1672.scala) | 0 |
11 files changed, 3 insertions, 35 deletions
diff --git a/src/dotty/tools/dotc/core/Types.scala b/src/dotty/tools/dotc/core/Types.scala index 335e72e3f..716657595 100644 --- a/src/dotty/tools/dotc/core/Types.scala +++ b/src/dotty/tools/dotc/core/Types.scala @@ -397,7 +397,7 @@ object Types { */ final def findMember(name: Name, pre: Type, excluded: FlagSet)(implicit ctx: Context): Denotation = try { recCount += 1 - assert(recCount < 20) + assert(recCount < 40) @tailrec def go(tp: Type): Denotation = tp match { case tp: RefinedType => if (name eq tp.refinedName) goRefined(tp) else go(tp.parent) diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala index 966c231e4..b6ff07efb 100644 --- a/test/dotc/tests.scala +++ b/test/dotc/tests.scala @@ -23,6 +23,7 @@ class tests extends CompilerTest { val allowDeepSubtypes = defaultOptions diff List("-Yno-deep-subtypes") val posDir = "./tests/pos/" + val posSpecialDir = "./tests/pos-special/" val negDir = "./tests/neg/" val newDir = "./tests/new/" val dotcDir = "./src/dotty/" @@ -57,6 +58,7 @@ class tests extends CompilerTest { @Test def pos_tailcall = compileDir(posDir + "tailcall/", doErase) @Test def pos_nullarify = compileFile(posDir, "nullarify", "-Ycheck:nullarify" :: doErase) @Test def pos_subtyping = compileFile(posDir, "subtyping", doErase) + @Test def pos_t2613 = compileFile(posSpecialDir, "t2613", doErase)(allowDeepSubtypes) @Test def pos_all = compileFiles(posDir, twice) @Test def new_all = compileFiles(newDir, twice) diff --git a/tests/pending/pos/boundspropagation.scala b/tests/neg/boundspropagation.scala index 560d5416c..560d5416c 100644 --- a/tests/pending/pos/boundspropagation.scala +++ b/tests/neg/boundspropagation.scala diff --git a/tests/pending/pos/subtyping.scala b/tests/pending/pos/subtyping.scala deleted file mode 100644 index 8a3c2eb03..000000000 --- a/tests/pending/pos/subtyping.scala +++ /dev/null @@ -1,12 +0,0 @@ -object test { - - class B - class C - - def tag[T](x: T): String & T = ??? - - val x: Int & String = tag(0) - -} - - diff --git a/tests/pending/pos/tailcall/t1672.scala b/tests/pending/pos/tailcall/t1672.scala deleted file mode 100644 index 9be5c6066..000000000 --- a/tests/pending/pos/tailcall/t1672.scala +++ /dev/null @@ -1,10 +0,0 @@ -object Test1672 { - @annotation.tailrec - def bar(x: Int)(y: Int) : Nothing = { - try { - throw new RuntimeException - } catch { - case _: Throwable => bar(x)(y) - } - } -} diff --git a/tests/pending/pos/vararg-pattern.scala b/tests/pending/pos/vararg-pattern.scala deleted file mode 100644 index 314d6460f..000000000 --- a/tests/pending/pos/vararg-pattern.scala +++ /dev/null @@ -1,12 +0,0 @@ -object Test { - - List(1, 2, 3, 4) match { - case List(1, 2, xs: _*) => - val ys: Seq[Int] = xs - println(ys) - } - val List(1, 2, x: _*) = List(1, 2, 3, 4) - -} - - diff --git a/tests/pending/pos/t2613.scala b/tests/pos-special/t2613.scala index c234d4c0d..c234d4c0d 100644 --- a/tests/pending/pos/t2613.scala +++ b/tests/pos-special/t2613.scala diff --git a/tests/pending/pos/t2795-new.scala b/tests/pos/t2795-new.scala index e307133e0..e307133e0 100644 --- a/tests/pending/pos/t2795-new.scala +++ b/tests/pos/t2795-new.scala diff --git a/tests/pending/pos/t2795-old.scala b/tests/pos/t2795-old.scala index 935cb1f44..935cb1f44 100644 --- a/tests/pending/pos/t2795-old.scala +++ b/tests/pos/t2795-old.scala diff --git a/tests/pending/pos/t2945.scala b/tests/pos/t2945.scala index 54f0a7724..54f0a7724 100644 --- a/tests/pending/pos/t2945.scala +++ b/tests/pos/t2945.scala diff --git a/tests/pending/pos/t1672.scala b/tests/pos/tailcall/t1672.scala index 77a86db22..77a86db22 100644 --- a/tests/pending/pos/t1672.scala +++ b/tests/pos/tailcall/t1672.scala |