summaryrefslogtreecommitdiff
path: root/test/files/pos
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2009-11-18 22:06:03 +0000
committerPaul Phillips <paulp@improving.org>2009-11-18 22:06:03 +0000
commitae024cebd4a41339039f3df91c8aa4a02522594f (patch)
tree07c5e3a27ce4636f76eb73fe43353fc6c6aa0362 /test/files/pos
parent536955e1afd68ac6f99f0347fa14a58ab47cb958 (diff)
downloadscala-ae024cebd4a41339039f3df91c8aa4a02522594f.tar.gz
scala-ae024cebd4a41339039f3df91c8aa4a02522594f.tar.bz2
scala-ae024cebd4a41339039f3df91c8aa4a02522594f.zip
Finally completed the incredibly tedious task o...
Finally completed the incredibly tedious task of removing the lower case primitive aliases from Predef. Had to rebuild msil.jar along the way.
Diffstat (limited to 'test/files/pos')
-rw-r--r--test/files/pos/bug0091.scala2
-rw-r--r--test/files/pos/bug1075.scala2
-rw-r--r--test/files/pos/bug287.scala2
-rw-r--r--test/files/pos/nested2.scala2
-rw-r--r--test/files/pos/switchUnbox.scala2
-rw-r--r--test/files/pos/t1164.scala2
6 files changed, 6 insertions, 6 deletions
diff --git a/test/files/pos/bug0091.scala b/test/files/pos/bug0091.scala
index 54c821b41c..d491b7cfb9 100644
--- a/test/files/pos/bug0091.scala
+++ b/test/files/pos/bug0091.scala
@@ -1,6 +1,6 @@
class Bug {
def main(args: Array[String]) = {
var msg: String = null; // no bug if "null" instead of "_"
- val f: PartialFunction[Any, unit] = { case 42 => msg = "coucou" };
+ val f: PartialFunction[Any, Unit] = { case 42 => msg = "coucou" };
}
}
diff --git a/test/files/pos/bug1075.scala b/test/files/pos/bug1075.scala
index 936ef72272..0f518b24db 100644
--- a/test/files/pos/bug1075.scala
+++ b/test/files/pos/bug1075.scala
@@ -5,7 +5,7 @@ class Directory(var dir_ : String)
}
dir_ = dir_.replaceAll("/{2,}", "/")
- def this(serialized : Array[byte]) = {
+ def this(serialized : Array[Byte]) = {
this(new String(serialized, "UTF-8"))
}
diff --git a/test/files/pos/bug287.scala b/test/files/pos/bug287.scala
index 81a01951b2..8e5e8831c1 100644
--- a/test/files/pos/bug287.scala
+++ b/test/files/pos/bug287.scala
@@ -1,7 +1,7 @@
object testBuf {
class mystream extends java.io.BufferedOutputStream(new java.io.FileOutputStream("/dev/null")) {
def w( x:String ):Unit = {
- val foo = new Array[byte](2);
+ val foo = new Array[Byte](2);
// write( byte[] ) is defined in FilterOutputStream, the superclass of BufferedOutputStream
super.write( foo ); // error
diff --git a/test/files/pos/nested2.scala b/test/files/pos/nested2.scala
index 302688a0ef..421ea6facf 100644
--- a/test/files/pos/nested2.scala
+++ b/test/files/pos/nested2.scala
@@ -5,5 +5,5 @@ class C[A] {
object Test {
val x = new C[String]
- val y: C[String]#D[int] = new x.D[int]
+ val y: C[String]#D[Int] = new x.D[Int]
}
diff --git a/test/files/pos/switchUnbox.scala b/test/files/pos/switchUnbox.scala
index a97bff5521..4f5467de29 100644
--- a/test/files/pos/switchUnbox.scala
+++ b/test/files/pos/switchUnbox.scala
@@ -2,7 +2,7 @@
// that contains -Xsqueeze:on
//
object Foo {
- var xyz: (int, String) = (1, "abc")
+ var xyz: (Int, String) = (1, "abc")
xyz._1 match {
case 1 => Console.println("OK")
case 2 => Console.println("OK")
diff --git a/test/files/pos/t1164.scala b/test/files/pos/t1164.scala
index 3acda88ba9..b238bf54d9 100644
--- a/test/files/pos/t1164.scala
+++ b/test/files/pos/t1164.scala
@@ -15,7 +15,7 @@ object test {
// Try the same thing as above but use function as arguemnt to Bar
// constructor
- type FunIntToA [a] = (int) => a
+ type FunIntToA [a] = (Int) => a
class Bar[a] (var f: FunIntToA[a])
object Bar {