summaryrefslogtreecommitdiff
path: root/test/files/continuations-run/ts-1681-2.scala
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@epfl.ch>2012-06-28 03:53:06 -0700
committerAdriaan Moors <adriaan.moors@epfl.ch>2012-06-28 03:53:06 -0700
commitdf00b410635cd3164b74ab55d1b44fd772a65653 (patch)
tree9c5fa36022898eace09b431f3b05dfb1cc4545ea /test/files/continuations-run/ts-1681-2.scala
parent2261452d18e955e16bbe43e7a21e8d79c44325e8 (diff)
parent1a3976fc8276e6e3d7eeda12f645782ca93ea24b (diff)
downloadscala-df00b410635cd3164b74ab55d1b44fd772a65653.tar.gz
scala-df00b410635cd3164b74ab55d1b44fd772a65653.tar.bz2
scala-df00b410635cd3164b74ab55d1b44fd772a65653.zip
Merge pull request #783 from phaller/topic/cps-return-revert
Revert pull request #720 (CPS: enable return expressions in CPS code if ...
Diffstat (limited to 'test/files/continuations-run/ts-1681-2.scala')
-rw-r--r--test/files/continuations-run/ts-1681-2.scala44
1 files changed, 0 insertions, 44 deletions
diff --git a/test/files/continuations-run/ts-1681-2.scala b/test/files/continuations-run/ts-1681-2.scala
deleted file mode 100644
index 8a896dec2c..0000000000
--- a/test/files/continuations-run/ts-1681-2.scala
+++ /dev/null
@@ -1,44 +0,0 @@
-import scala.util.continuations._
-
-class ReturnRepro {
- def s1: Int @cps[Any] = shift { k => k(5) }
- def caller = reset { println(p(3)) }
- def caller2 = reset { println(p2(3)) }
- def caller3 = reset { println(p3(3)) }
-
- def p(i: Int): Int @cps[Any] = {
- val v= s1 + 3
- return v
- }
-
- def p2(i: Int): Int @cps[Any] = {
- val v = s1 + 3
- if (v > 0) {
- println("hi")
- return v
- } else {
- println("hi")
- return 8
- }
- }
-
- def p3(i: Int): Int @cps[Any] = {
- val v = s1 + 3
- try {
- println("from try")
- return v
- } catch {
- case e: Exception =>
- println("from catch")
- return 7
- }
- }
-
-}
-
-object Test extends App {
- val repro = new ReturnRepro
- repro.caller
- repro.caller2
- repro.caller3
-}