summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McDirmid <sean.mcdirmid@gmail.com>2007-08-29 10:39:41 +0000
committerSean McDirmid <sean.mcdirmid@gmail.com>2007-08-29 10:39:41 +0000
commitb0f070a6aae32d6abc4481c2fcfc6b0cbf71d245 (patch)
tree84e609804a5b57e6488ce3edda743da1bcca395a
parent9d12fe104d1c20199df227696e47fdfb7efae416 (diff)
downloadscala-b0f070a6aae32d6abc4481c2fcfc6b0cbf71d245.tar.gz
scala-b0f070a6aae32d6abc4481c2fcfc6b0cbf71d245.tar.bz2
scala-b0f070a6aae32d6abc4481c2fcfc6b0cbf71d245.zip
* colltest - changed to jcl.LinkedHashSet
* interpreter - Added explicit force in array slice call (implicit in Predefs should handle this, but it doesn't seem like it works here)
-rw-r--r--test/files/run/colltest.scala2
-rw-r--r--test/files/run/interpreter.scala2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/files/run/colltest.scala b/test/files/run/colltest.scala
index 049c075fa1..864753aca1 100644
--- a/test/files/run/colltest.scala
+++ b/test/files/run/colltest.scala
@@ -46,5 +46,5 @@ class TestSet(s0: Set[int], s1: Set[int]) {
Console.println("succeeded for "+Iterations+" iterations.")
}
object Test extends Application {
- new TestSet(HashSet.empty, new LinkedHashSet)
+ new TestSet(HashSet.empty, new scala.collection.jcl.LinkedHashSet)
}
diff --git a/test/files/run/interpreter.scala b/test/files/run/interpreter.scala
index 77e3e41662..2c69185516 100644
--- a/test/files/run/interpreter.scala
+++ b/test/files/run/interpreter.scala
@@ -112,7 +112,7 @@ def x => y => z
val i = slice.indexOf('\n')
if (i >= 0) {
seenNL = true
- writer.write(slice, i+1, slice.length-(i+1))
+ writer.write(slice.force, i+1, slice.length-(i+1))
} else {
// skip it
}