aboutsummaryrefslogtreecommitdiff
path: root/test/dotc/tests.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2014-07-13 14:12:00 +0200
committerMartin Odersky <odersky@gmail.com>2014-07-17 11:02:03 +0200
commit3f3581c1fdefbebf06d4b3d12c6474c2997ec52d (patch)
treed0d6dc101647a0f78e30bee1b298757b96c0890e /test/dotc/tests.scala
parent65a85700146674d64f02aed1f2ec185a8ff41c7a (diff)
downloaddotty-3f3581c1fdefbebf06d4b3d12c6474c2997ec52d.tar.gz
dotty-3f3581c1fdefbebf06d4b3d12c6474c2997ec52d.tar.bz2
dotty-3f3581c1fdefbebf06d4b3d12c6474c2997ec52d.zip
Make ExtensionMethods not rely on TailRec
This acommit allows TailRec to run after ExtensionMethods. This is due to the following changes: 1) Extension methods now "rewire" calls to other extension methods of the same class, so that they go directly to other extension methods instead of to the original method in the class. 2) Tailrec annotations get removed from original method and get added to the extension method instead. With this commit all tests can be re-enabled again.
Diffstat (limited to 'test/dotc/tests.scala')
-rw-r--r--test/dotc/tests.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala
index ac4e915c2..f1896cbdf 100644
--- a/test/dotc/tests.scala
+++ b/test/dotc/tests.scala
@@ -14,7 +14,7 @@ class tests extends CompilerTest {
"-pagewidth", "160")
implicit val defaultOptions = noCheckOptions ++ List(
- "-Yskip:tailrec, -Ycheck:extmethods"//, "-Ystop-before:terminal"
+ "-Ycheck:extmethods"//, "-Ystop-before:terminal"
)
val twice = List("#runs", "2", "-YnoDoubleBindings")
@@ -78,7 +78,7 @@ class tests extends CompilerTest {
@Test def neg_t1192_legalPrefix = compileFile(negDir, "t1192", xerrors = 1)
@Test def neg_tailcall_t1672b = compileFile(negDir, "tailcall/t1672b", xerrors = 6)
@Test def neg_tailcall_t3275 = compileFile(negDir, "tailcall/t3275", xerrors = 1)
- @Test def neg_tailcall_t6574 = compileFile(negDir, "tailcall/t6574", xerrors = 4)
+ @Test def neg_tailcall_t6574 = compileFile(negDir, "tailcall/t6574", xerrors = 2)
@Test def neg_tailcall = compileFile(negDir, "tailcall/tailrec", xerrors = 7)
@Test def neg_tailcall2 = compileFile(negDir, "tailcall/tailrec-2", xerrors = 2)
@Test def neg_tailcall3 = compileFile(negDir, "tailcall/tailrec-3", xerrors = 2)