summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authormihaylov <mihaylov@epfl.ch>2005-10-04 16:15:01 +0000
committermihaylov <mihaylov@epfl.ch>2005-10-04 16:15:01 +0000
commitc9305ff74fc9e23d2a8f4c6a27a25e5562c048cc (patch)
tree759783168829fe3609bca18f4682572a1b2ac814 /test
parentf13923cb2aea70b69f548a5c0fabd343809132b8 (diff)
downloadscala-c9305ff74fc9e23d2a8f4c6a27a25e5562c048cc.tar.gz
scala-c9305ff74fc9e23d2a8f4c6a27a25e5562c048cc.tar.bz2
scala-c9305ff74fc9e23d2a8f4c6a27a25e5562c048cc.zip
*** empty log message ***
Diffstat (limited to 'test')
-rw-r--r--test/files/jvm/bug281.check0
-rw-r--r--test/files/jvm/bug281.scala14
-rw-r--r--test/files/run/Course-2002-06.scala6
-rw-r--r--test/files/run/runtime-msil.check64
4 files changed, 78 insertions, 6 deletions
diff --git a/test/files/jvm/bug281.check b/test/files/jvm/bug281.check
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/test/files/jvm/bug281.check
diff --git a/test/files/jvm/bug281.scala b/test/files/jvm/bug281.scala
new file mode 100644
index 0000000000..5f8c15b6ae
--- /dev/null
+++ b/test/files/jvm/bug281.scala
@@ -0,0 +1,14 @@
+//############################################################################
+// Bug 281
+
+class Bug281A extends java.util.Hashtable {
+ class B { def f = rehash() };
+}
+
+object Test {
+ def main(args: Array[String]): Unit = {
+ val a = new Bug281A;
+ val b = new a.B;
+ b.f
+ }
+}
diff --git a/test/files/run/Course-2002-06.scala b/test/files/run/Course-2002-06.scala
index ca816eda06..8ce003333f 100644
--- a/test/files/run/Course-2002-06.scala
+++ b/test/files/run/Course-2002-06.scala
@@ -122,12 +122,6 @@ class PostScript (filename: String, _width: Double, _height: Double)
scaleAndCenter(new Frame(origin, edgeX, edgeY), width / height)
}
-// /** File where to print.*/
-// import java.io._;
-// val out : PrintStream = new PrintStream(
-// if (filename == "-") java.lang.System.out
-// else new FileOutputStream(filename));
-
def plotLine(x1: Double, y1: Double, x2: Double, y2: Double): Unit = {
Console.println(round(x1) + " " + round(y1) + " m " +
round(x2) + " " + round(y2) + " l");
diff --git a/test/files/run/runtime-msil.check b/test/files/run/runtime-msil.check
new file mode 100644
index 0000000000..70e7608a11
--- /dev/null
+++ b/test/files/run/runtime-msil.check
@@ -0,0 +1,64 @@
+<<< Test0
+[False,True]
+[0,1,2]
+[3,4,5]
+[a,b,c]
+[6,7,8]
+[9,10,11]
+[12,13]
+[14,15]
+[string]
+>>> Test0
+
+<<< Test1
+10
+14
+15
+16
+20
+23
+24
+25
+26
+>>> Test1
+
+<<< Test2
+A
+M0
+N0
+
+A
+N0
+M0
+
+A
+M0
+M1
+N0
+
+A
+N0
+N1
+M0
+
+>>> Test2
+
+<<< Test3
+Ok
+Ok
+Ok
+Ok
+Ok
+Ok
+Ok
+Ok
+Ok
+Ok
+Ok
+Ok
+Ok
+Ok
+Ok
+Ok
+>>> Test3
+