improve cps handling of if-then-else. no review.

4 files changed, 69 insertions, 0 deletions

diff --git a/test/files/continuations-run/ifelse4.check b/test/files/continuations-run/ifelse4.check
new file mode 100644
index 0000000000..2545dd49a0
--- /dev/null
+++ b/test/files/continuations-run/ifelse4.check
@@ -0,0 +1,4 @@
+10
+10
+10
+10
diff --git a/test/files/continuations-run/ifelse4.scala b/test/files/continuations-run/ifelse4.scala
new file mode 100644
index 0000000000..8360375283
--- /dev/null
+++ b/test/files/continuations-run/ifelse4.scala
@@ -0,0 +1,31 @@
+import scala.util.continuations._
+
+object Test {
+  def sh(x1:Int) = shift( (k: Int => Int) => k(k(k(x1))))
+  
+  def testA(x1: Int): Int @cps[Int] = {
+      sh(x1)
+      if (x1==42) x1 else sh(x1)
+  }
+
+  def testB(x1: Int): Int @cps[Int] = {
+      if (sh(x1)==43) x1 else x1
+  }
+  
+  def testC(x1: Int): Int @cps[Int] = {
+      sh(x1)
+      if (sh(x1)==44) x1 else x1
+  }
+
+  def testD(x1: Int): Int @cps[Int] = {
+      sh(x1)
+      if (sh(x1)==45) x1 else sh(x1)
+  }
+
+  def main(args: Array[String]): Any = {
+    println(reset(1 + testA(7)))
+    println(reset(1 + testB(9)))
+    println(reset(1 + testC(9)))
+    println(reset(1 + testD(7)))
+  }
+}
\ No newline at end of file
diff --git a/test/files/continuations-run/patvirt.check b/test/files/continuations-run/patvirt.check
new file mode 100644
index 0000000000..b5fa014ad3
--- /dev/null
+++ b/test/files/continuations-run/patvirt.check
@@ -0,0 +1,2 @@
+10
+11
diff --git a/test/files/continuations-run/patvirt.scala b/test/files/continuations-run/patvirt.scala
new file mode 100644
index 0000000000..5b4d312f20
--- /dev/null
+++ b/test/files/continuations-run/patvirt.scala
@@ -0,0 +1,32 @@
+import scala.util.continuations._
+
+object Test {
+  def sh(x1:Int) = shift( (k: Int => Int) => k(k(k(x1))))
+  
+  def test(x1: Int) = {
+    val o7 = {
+      val o6 = {
+        val o3 = 
+          if (7 == x1) Some(x1)
+          else None
+
+        if (o3.isEmpty) None
+        else Some(sh(x1))
+      }
+      if (o6.isEmpty) {
+        val o5 =
+          if (8 == x1) Some(x1)
+          else None
+
+        if (o5.isEmpty) None
+        else Some(sh(x1))
+      } else o6
+    }
+    o7.get
+  }
+
+  def main(args: Array[String]): Any = {
+    println(reset(1 + test(7)))
+    println(reset(1 + test(8)))
+  }
+}