summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2008-05-20 12:28:44 +0000
committermichelou <michelou@epfl.ch>2008-05-20 12:28:44 +0000
commit7d71e4cf09074f3d1cf7539d28bba64a976524d6 (patch)
tree43d8e96fc7b8fb23f1cf4cc7af34cec17a44a347 /test
parentf95cde8984bbf21ce38746773c6929fe52098953 (diff)
downloadscala-7d71e4cf09074f3d1cf7539d28bba64a976524d6.tar.gz
scala-7d71e4cf09074f3d1cf7539d28bba64a976524d6.tar.bz2
scala-7d71e4cf09074f3d1cf7539d28bba64a976524d6.zip
int -> Int, etc..
Diffstat (limited to 'test')
-rw-r--r--test/files/pos/bug1034.scala8
-rw-r--r--test/files/pos/bug119.scala6
-rw-r--r--test/files/pos/bug210.scala8
-rw-r--r--test/files/pos/ksbug1.scala6
-rw-r--r--test/files/pos/viewtest1.scala8
5 files changed, 18 insertions, 18 deletions
diff --git a/test/files/pos/bug1034.scala b/test/files/pos/bug1034.scala
index d6c1591bd2..9d966334a6 100644
--- a/test/files/pos/bug1034.scala
+++ b/test/files/pos/bug1034.scala
@@ -1,6 +1,6 @@
object Terminal {
- def apply[a] : a => unit = { a => () }
- val i0 = Terminal.apply[int]
- val i1 = (Terminal)[int]
- val i2 = Terminal[int]
+ def apply[a] : a => Unit = { a => () }
+ val i0 = Terminal.apply[Int]
+ val i1 = (Terminal)[Int]
+ val i2 = Terminal[Int]
}
diff --git a/test/files/pos/bug119.scala b/test/files/pos/bug119.scala
index e3f0993862..44a1566756 100644
--- a/test/files/pos/bug119.scala
+++ b/test/files/pos/bug119.scala
@@ -1,7 +1,7 @@
class K[E] {
- case class A(v:E){};
+ case class A(v: E) {}
}
-class K2 extends K[int] {
- val A(v) = A(42);
+class K2 extends K[Int] {
+ val A(v) = A(42)
}
diff --git a/test/files/pos/bug210.scala b/test/files/pos/bug210.scala
index 9a7ef62cd9..0049d1f34c 100644
--- a/test/files/pos/bug210.scala
+++ b/test/files/pos/bug210.scala
@@ -1,8 +1,8 @@
trait Lang1 {
trait Exp;
- trait Visitor { def f(left: Exp): unit; }
+ trait Visitor { def f(left: Exp): Unit }
class Eval1 extends Visitor { self: Visitor =>
- def f(left: Exp) = ();
+ def f(left: Exp) = ()
}
}
@@ -11,7 +11,7 @@ trait Lang2 extends Lang1 {
}
/*
object Main with Application {
- val lang2 = new Lang2 {};
- val eval = new lang2.Eval2;
+ val lang2 = new Lang2 {}
+ val eval = new lang2.Eval2
}
*/
diff --git a/test/files/pos/ksbug1.scala b/test/files/pos/ksbug1.scala
index b3e1631370..ee6ab9b49f 100644
--- a/test/files/pos/ksbug1.scala
+++ b/test/files/pos/ksbug1.scala
@@ -1,4 +1,4 @@
object test {
- type z[a,b] = a => b
- def f : z[int,int] = (i => i + 1)
-} \ No newline at end of file
+ type z[a, b] = a => b
+ def f : z[Int, Int] = (i => i + 1)
+}
diff --git a/test/files/pos/viewtest1.scala b/test/files/pos/viewtest1.scala
index d566487af1..c681ae7069 100644
--- a/test/files/pos/viewtest1.scala
+++ b/test/files/pos/viewtest1.scala
@@ -1,7 +1,7 @@
package test
trait Ordered[a] {
- def < (x: a): boolean
+ def < (x: a): Boolean
}
object O {
@@ -32,11 +32,11 @@ abstract class Tree[+a <% Ordered[a]] {
object Test {
import O.view
- def main(args: Array[String]) = {
+ def main(args: Array[String]) {
var t: Tree[String] = Empty
- for (val s <- args) {
+ for (s <- args) {
t = t insert s
}
- Console.println(t.elements)
+ println(t.elements)
}
}