2 files changed, 84 insertions, 0 deletions

diff --git a/test/files/run/forvaleq.check b/test/files/run/forvaleq.check
new file mode 100644
index 0000000000..141ac1ebfe
--- /dev/null
+++ b/test/files/run/forvaleq.check
@@ -0,0 +1,4 @@
+List(2, 6, 10, 14, 18, 22, 24, 26, 28, 30, 32, 34, 36, 38)
+List(2, 6, 10, 14, 18, 22, 24, 26, 28, 30, 32, 34, 36, 38)
+List(2, 6, 10, 14, 18, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2)
+called 21 times
diff --git a/test/files/run/forvaleq.scala b/test/files/run/forvaleq.scala
new file mode 100644
index 0000000000..284efc7918
--- /dev/null
+++ b/test/files/run/forvaleq.scala
@@ -0,0 +1,80 @@
+// test "val foo =" clauses in for comprehensions
+// $Id$
+
+import scala.collection.immutable.Queue
+import scala.{List=>L}
+
+object Test {
+  // redefine some symbols to make it extra hard
+  /*
+  class List
+  class Pair
+  class Tuple2
+  def List[A](as:A*) = 5
+  */
+  def firstDigit(x:int): int =
+    x match {
+    case 0 => 0
+    case _ if(x<0) => firstDigit(-x)
+    case _ if(x<10) => x
+    case _ => firstDigit(x / 10)
+  }
+
+
+  {
+    // a basic test case
+
+    val input = L.range(0,20)
+    val oddFirstTimesTwo =
+      for{val x <- input
+          val xf = firstDigit(x)
+          xf % 2 == 1}
+        yield x*2
+    Console.println(oddFirstTimesTwo)
+  }
+
+  {
+    // make sure it works on non-Ls
+
+ //   val input: Queue = Queue.Empty[int].incl(L.range(0,20))
+    val input = L.range(0,20).elements
+    val oddFirstTimesTwo =
+      for{val x <- input
+          val xf = firstDigit(x)
+          xf % 2 == 1}
+        yield x*2
+    Console.println(oddFirstTimesTwo.toL)
+  }
+
+  {
+    // yield the computed value
+
+    val input = L.range(0,20)
+    val oddFirstTimesTwo =
+      for{val x <- input
+          val xf = firstDigit(x)
+          xf % 2 == 1}
+        yield xf*2
+    Console.println(oddFirstTimesTwo)
+  }
+
+  {
+    // make sure the function is only called once
+    var count: int = 0
+
+    def fdct(x: int) = {
+      count = count + 1
+      firstDigit(x)
+    }
+
+    val input = L.range(0,20)
+    for{val x <- input
+        val xf = fdct(x)
+        xf % 2 == 1}
+      yield xf
+
+    Console.println("called " + count + " times")
+  }
+
+  def main(args: Array[String]): Unit = ()
+}