diff options
| author | phaller <philipp.haller@typesafe.com> | 2012-06-26 17:09:21 +0200 |
|---|---|---|
| committer | phaller <philipp.haller@typesafe.com> | 2012-06-27 14:37:20 +0200 |
| commit | 1a3976fc8276e6e3d7eeda12f645782ca93ea24b (patch) | |
| tree | ac9eab394af6186acbac7efbcf0f3b8d57c577dd /test/files/continuations-neg | |
| parent | 161b58358ea8685aea26cdfd2fc2d689ce7414e7 (diff) | |
| download | scala-1a3976fc8276e6e3d7eeda12f645782ca93ea24b.tar.gz scala-1a3976fc8276e6e3d7eeda12f645782ca93ea24b.tar.bz2 scala-1a3976fc8276e6e3d7eeda12f645782ca93ea24b.zip | |
Revert pull request #720 (CPS: enable return expressions in CPS code if they are in tail position)
Reverts commit 0ada0706746c9c603bf5bc8a0e6780e5783297cf.
Reverts commit 51c92f02229098d0b402a65a72267f7a17984022.
Reverts commit cdfbe8e39fbbec00c969cd74f117ae410b98b40b.
Reverts commit 796024c7429a03e974a7d8e1dc5c80b84f82467d.
Diffstat (limited to 'test/files/continuations-neg')
| -rw-r--r-- | test/files/continuations-neg/ts-1681-nontail-return.check | 4 | ||||
| -rw-r--r-- | test/files/continuations-neg/ts-1681-nontail-return.scala | 18 |
2 files changed, 0 insertions, 22 deletions
diff --git a/test/files/continuations-neg/ts-1681-nontail-return.check b/test/files/continuations-neg/ts-1681-nontail-return.check deleted file mode 100644 index 8fe15f154b..0000000000 --- a/test/files/continuations-neg/ts-1681-nontail-return.check +++ /dev/null @@ -1,4 +0,0 @@ -ts-1681-nontail-return.scala:10: error: return expressions in CPS code must be in tail position - return v - ^ -one error found diff --git a/test/files/continuations-neg/ts-1681-nontail-return.scala b/test/files/continuations-neg/ts-1681-nontail-return.scala deleted file mode 100644 index af86ad304f..0000000000 --- a/test/files/continuations-neg/ts-1681-nontail-return.scala +++ /dev/null @@ -1,18 +0,0 @@ -import scala.util.continuations._ - -class ReturnRepro { - def s1: Int @cpsParam[Any, Unit] = shift { k => k(5) } - def caller = reset { println(p(3)) } - - def p(i: Int): Int @cpsParam[Unit, Any] = { - val v= s1 + 3 - if (v == 8) - return v - v + 1 - } -} - -object Test extends App { - val repro = new ReturnRepro - repro.caller -} |