int -> Int, etc..

1 files changed, 33 insertions, 33 deletions

diff --git a/test/files/run/forvaleq.scala b/test/files/run/forvaleq.scala
index a30c659ecc..1e4fd33dbc 100644
--- a/test/files/run/forvaleq.scala
+++ b/test/files/run/forvaleq.scala
@@ -1,4 +1,4 @@
-// test "val foo =" clauses in for comprehensions
+// test "foo = expr" clauses in for comprehensions
 // $Id$
 
 import scala.collection.immutable.Queue
@@ -8,13 +8,13 @@ object Test {
   // redefine some symbols to make it extra hard
   class List
   class Tuple2
-  def List[A](as:A*) = 5
+  def List[A](as: A*) = 5
 
-  def firstDigit(x:int): int =
+  def firstDigit(x: Int): Int =
     x match {
     case 0 => 0
-    case _ if(x<0) => firstDigit(-x)
-    case _ if(x<10) => x
+    case _ if (x<0) => firstDigit(-x)
+    case _ if (x<10) => x
     case _ => firstDigit(x / 10)
   }
 
@@ -24,38 +24,38 @@ object Test {
 
     val input = L.range(0,20)
     val oddFirstTimesTwo =
-      for{val x <- input
-          val xf = firstDigit(x)
-          xf % 2 == 1}
+      for {x <- input
+           xf = firstDigit(x)
+           if xf % 2 == 1}
         yield x*2
-    Console.println(oddFirstTimesTwo)
+    println(oddFirstTimesTwo)
   }
 
   {
     // a test case with patterns
 
-    val input = L.range(0,20)
+    val input = L.range(0, 20)
     val oddFirstTimesTwo =
-      for{val x <- input
-          val xf = firstDigit(x)
-          val yf = x - firstDigit(x) / 10
-          val Pair(a, b) = Pair(xf - yf, xf + yf)
-          xf % 2 == 1}
+      for {x <- input
+           xf = firstDigit(x)
+           yf = x - firstDigit(x) / 10
+           (a, b) = (xf - yf, xf + yf)
+           if xf % 2 == 1}
         yield a + b
-    Console.println(oddFirstTimesTwo)
+    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 input = L.range(0, 20).elements
     val oddFirstTimesTwo =
-      for{val x <- input
-          val xf = firstDigit(x)
-          xf % 2 == 1}
+      for {x <- input
+          xf = firstDigit(x)
+          if xf % 2 == 1}
         yield x*2
-    Console.println(oddFirstTimesTwo.toList)
+    println(oddFirstTimesTwo.toList)
   }
 
   {
@@ -63,30 +63,30 @@ object Test {
 
     val input = L.range(0,20)
     val oddFirstTimesTwo =
-      for{val x <- input
-          val xf = firstDigit(x)
-          xf % 2 == 1}
+      for {x <- input
+          xf = firstDigit(x)
+          if xf % 2 == 1}
         yield xf*2
-    Console.println(oddFirstTimesTwo)
+    println(oddFirstTimesTwo)
   }
 
   {
     // make sure the function is only called once
-    var count: int = 0
+    var count: Int = 0
 
-    def fdct(x: int) = {
-      count = count + 1
+    def fdct(x: Int) = {
+      count += 1
       firstDigit(x)
     }
 
     val input = L.range(0,20)
-    for{val x <- input
-        val xf = fdct(x)
-        xf % 2 == 1}
+    for {x <- input
+         xf = fdct(x)
+         if xf % 2 == 1}
       yield xf
 
-    Console.println("called " + count + " times")
+    println("called " + count + " times")
   }
 
-  def main(args: Array[String]): Unit = ()
+  def main(args: Array[String]) {}
 }