diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-04-13 20:15:10 +0200 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-04-14 11:50:49 +0200 |
| commit | 4804efef205adbe359dd353d51ab16e1e0337dc5 (patch) | |
| tree | a4c1cc4de24ea43ef7d1d9f43ecdfc639138db5d /test/files/presentation | |
| parent | 391f92f4005700799ac2e775980f5c5a77fea203 (diff) | |
| download | scala-4804efef205adbe359dd353d51ab16e1e0337dc5.tar.gz scala-4804efef205adbe359dd353d51ab16e1e0337dc5.tar.bz2 scala-4804efef205adbe359dd353d51ab16e1e0337dc5.zip | |
virtpatmat on by default; chicken out: -Xoldpatmat
some tests (unreachability, exhaustivity, @switch annotation checking) are still run under -Xoldpatmat,
but that will change before we go into RC mode (then the test/ partest of this commit will be reverted)
removed irrelevant dependency on patmat
Diffstat (limited to 'test/files/presentation')
| -rw-r--r-- | test/files/presentation/callcc-interpreter/Runner.scala | 4 | ||||
| -rw-r--r-- | test/files/presentation/random.check | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/test/files/presentation/callcc-interpreter/Runner.scala b/test/files/presentation/callcc-interpreter/Runner.scala index 1ef3cf9025..61b6efd50d 100644 --- a/test/files/presentation/callcc-interpreter/Runner.scala +++ b/test/files/presentation/callcc-interpreter/Runner.scala @@ -1,3 +1,5 @@ import scala.tools.nsc.interactive.tests._ -object Test extends InteractiveTest
\ No newline at end of file +object Test extends InteractiveTest { + settings.XoldPatmat.value = true // TODO: could this be running into some kind of race condition? sometimes the match has been translated, sometimes it hasn't +}
\ No newline at end of file diff --git a/test/files/presentation/random.check b/test/files/presentation/random.check index fce4b69fb3..1b73720312 100644 --- a/test/files/presentation/random.check +++ b/test/files/presentation/random.check @@ -4,7 +4,8 @@ askType at Random.scala(18,14) ================================================================================ [response] askTypeAt at (18,14) val filter: Int => Boolean = try { - java.this.lang.Integer.parseInt(args.apply(0)) match { + case <synthetic> val x1: Int = java.this.lang.Integer.parseInt(args.apply(0)); + x1 match { case 1 => ((x: Int) => x.%(2).!=(0)) case 2 => ((x: Int) => x.%(2).==(0)) case _ => ((x: Int) => x.!=(0)) |