summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorpaltherr <paltherr@epfl.ch>2003-12-04 16:36:31 +0000
committerpaltherr <paltherr@epfl.ch>2003-12-04 16:36:31 +0000
commit8796df13604ef131cadc4f3c781fd6d35a5fa213 (patch)
tree8e4f6a2880424d725e01cefeeb24ac49434e19ab /test
parentdbbab2f7f8b7cd16155112068c4784809ddd73f7 (diff)
downloadscala-8796df13604ef131cadc4f3c781fd6d35a5fa213.tar.gz
scala-8796df13604ef131cadc4f3c781fd6d35a5fa213.tar.bz2
scala-8796df13604ef131cadc4f3c781fd6d35a5fa213.zip
- Flattened Byte, Short and Char
Diffstat (limited to 'test')
-rw-r--r--test/files/run/arrays.scala20
-rw-r--r--test/files/run/iq.scala6
2 files changed, 11 insertions, 15 deletions
diff --git a/test/files/run/arrays.scala b/test/files/run/arrays.scala
index 048e067b2b..02add14a46 100644
--- a/test/files/run/arrays.scala
+++ b/test/files/run/arrays.scala
@@ -74,9 +74,9 @@ object arrays {
System.out.println();
check("zarray(0)", zarray(0), false);
- check("barray(0)", barray(0), 0);
- check("sarray(0)", sarray(0), 0);
- check("carray(0)", carray(0), 0);
+ check("barray(0)", barray(0), 0: byte);
+ check("sarray(0)", sarray(0), 0: short);
+ check("carray(0)", carray(0), '\u0000');
check("iarray(0)", iarray(0), 0);
check("larray(0)", larray(0), 0l);
check("farray(0)", farray(0), 0f);
@@ -85,9 +85,9 @@ object arrays {
System.out.println();
check("zarray(1)", zarray(1), false);
- check("barray(1)", barray(1), 0);
- check("sarray(1)", sarray(1), 0);
- check("carray(1)", carray(1), 0);
+ check("barray(1)", barray(1), 0: byte);
+ check("sarray(1)", sarray(1), 0: short);
+ check("carray(1)", carray(1), '\u0000');
check("iarray(1)", iarray(1), 0);
check("larray(1)", larray(1), 0l);
check("farray(1)", farray(1), 0f);
@@ -116,8 +116,8 @@ object arrays {
rarray(1) ="9";
check("zarray(0)", zarray(0), false);
- check("barray(0)", barray(0), 1);
- check("sarray(0)", sarray(0), 2);
+ check("barray(0)", barray(0), 1: byte);
+ check("sarray(0)", sarray(0), 2: short);
check("carray(0)", carray(0),'3');
check("iarray(0)", iarray(0), 4);
check("larray(0)", larray(0), 5l);
@@ -127,8 +127,8 @@ object arrays {
System.out.println();
check("zarray(1)", zarray(1), true);
- check("barray(1)", barray(1), 2);
- check("sarray(1)", sarray(1), 3);
+ check("barray(1)", barray(1), 2: byte);
+ check("sarray(1)", sarray(1), 3: short);
check("carray(1)", carray(1),'4');
check("iarray(1)", iarray(1), 5);
check("larray(1)", larray(1), 6l);
diff --git a/test/files/run/iq.scala b/test/files/run/iq.scala
index a02a79a53b..dd0ce3f3d2 100644
--- a/test/files/run/iq.scala
+++ b/test/files/run/iq.scala
@@ -45,11 +45,7 @@ object iq {
- val q5c:Queue[char] = Queue.Empty.enqueue(0: char, 1: char,
- 2: char, 3: char,
- 4: char, 5: char,
- 6: char, 7: char,
- 8: char, 9: char);
+ val q5c:Queue[int] = Queue.Empty.enqueue(0, 1, 2, 3, 4, 5, 6, 7, 8, 9);
/* Testing ==
* Expected: q5 == q9: true