summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2006-12-13 09:27:20 +0000
committermichelou <michelou@epfl.ch>2006-12-13 09:27:20 +0000
commit0d16edd1cec50620f0a270e81945a16483c9983b (patch)
tree6e85a655cd6adf46cbe56a6400846c1ef9a420f7 /test/files
parent8de6f6fe13ee02065edc10f54ef643ee36d37153 (diff)
downloadscala-0d16edd1cec50620f0a270e81945a16483c9983b.tar.gz
scala-0d16edd1cec50620f0a270e81945a16483c9983b.tar.bz2
scala-0d16edd1cec50620f0a270e81945a16483c9983b.zip
updated check files with new tuple syntax
Diffstat (limited to 'test/files')
-rw-r--r--test/files/jvm/serialization.check4
-rw-r--r--test/files/run/Course-2002-05.check40
-rw-r--r--test/files/run/Course-2002-07.check14
-rw-r--r--test/files/run/withIndex.check9
-rw-r--r--test/files/run/withIndex.scala2
5 files changed, 36 insertions, 33 deletions
diff --git a/test/files/jvm/serialization.check b/test/files/jvm/serialization.check
index 0643f30471..b576a27e36 100644
--- a/test/files/jvm/serialization.check
+++ b/test/files/jvm/serialization.check
@@ -14,8 +14,8 @@ x4 = <na>
y4 = <na>
x4(2): 4 - y4(2): 4
-x = List((buffers,20),(layers,2),(title,3))
-y = List((buffers,20),(layers,2),(title,3))
+x = List({buffers,20},{layers,2},{title,3})
+y = List({buffers,20},{layers,2},{title,3})
x equals y: true - y equals x: true
x = {buffers -> 20, layers -> 2, title -> 3}
diff --git a/test/files/run/Course-2002-05.check b/test/files/run/Course-2002-05.check
index aa73638bcb..7f840b7496 100644
--- a/test/files/run/Course-2002-05.check
+++ b/test/files/run/Course-2002-05.check
@@ -1,28 +1,28 @@
-(List(),List(1,2,3,4,5,6,7,8))
-(List(1,2,3,4),List(5,6,7,8))
-(List(1,2,3,4,5,6,7,8),List())
+{List(),List(1,2,3,4,5,6,7,8)}
+{List(1,2,3,4),List(5,6,7,8)}
+{List(1,2,3,4,5,6,7,8),List()}
-(List(),List(8,7,6,5,4,3,2,1))
-(List(4,3,2,1),List(8,7,6,5))
-(List(8,7,6,5,4,3,2,1),List())
+{List(),List(8,7,6,5,4,3,2,1)}
+{List(4,3,2,1),List(8,7,6,5)}
+{List(8,7,6,5,4,3,2,1),List()}
-(List(),List(7,2,1,5,4,3,8,6))
-(List(2,1,4,3),List(7,5,8,6))
-(List(7,2,1,5,4,3,8,6),List())
+{List(),List(7,2,1,5,4,3,8,6)}
+{List(2,1,4,3),List(7,5,8,6)}
+{List(7,2,1,5,4,3,8,6),List()}
List(1,2,3,4,5,6,7,8)
-(List(),List(1,2,3,4,5,6,7,8))
-(List(1,2,3,4),List(5,6,7,8))
-(List(1,2,3,4,5,6,7,8),List())
+{List(),List(1,2,3,4,5,6,7,8)}
+{List(1,2,3,4),List(5,6,7,8)}
+{List(1,2,3,4,5,6,7,8),List()}
-(List(),List(8,7,6,5,4,3,2,1))
-(List(4,3,2,1),List(8,7,6,5))
-(List(8,7,6,5,4,3,2,1),List())
+{List(),List(8,7,6,5,4,3,2,1)}
+{List(4,3,2,1),List(8,7,6,5)}
+{List(8,7,6,5,4,3,2,1),List()}
-(List(),List(7,2,1,5,4,3,8,6))
-(List(2,1,4,3),List(7,5,8,6))
-(List(7,2,1,5,4,3,8,6),List())
+{List(),List(7,2,1,5,4,3,8,6)}
+{List(2,1,4,3),List(7,5,8,6)}
+{List(7,2,1,5,4,3,8,6),List()}
List(1,2,3,4,5,6,7,8)
@@ -32,10 +32,10 @@ List(List(),List(2),List(1),List(1,2))
List(List(),List(3),List(2),List(2,3),List(1),List(1,3),List(1,2),List(1,2,3))
List(List(),List(4),List(3),List(3,4),List(2),List(2,4),List(2,3),List(2,3,4),List(1),List(1,4),List(1,3),List(1,3,4),List(1,2),List(1,2,4),List(1,2,3),List(1,2,3,4))
-queens(1) = List(List((1,1)))
+queens(1) = List(List({1,1}))
queens(2) = List()
queens(3) = List()
-queens(4) = List(List((4,3),(3,1),(2,4),(1,2)),List((4,2),(3,4),(2,1),(1,3)))
+queens(4) = List(List({4,3},{3,1},{2,4},{1,2}),List({4,2},{3,4},{2,1},{1,3}))
queens(1) = List(List(1))
queens(2) = List()
diff --git a/test/files/run/Course-2002-07.check b/test/files/run/Course-2002-07.check
index 0a378e6d20..9acc05b768 100644
--- a/test/files/run/Course-2002-07.check
+++ b/test/files/run/Course-2002-07.check
@@ -44,13 +44,13 @@ List(1,2,3,4,5,6) = concat(List(List(1,2),List(3,4),List(5,6)))
List() = zipFun(List(),List())
List() = zipFun(List(),List(a,b,c))
List() = zipFun(List(1,2,3),List())
-List((1,a)) = zipFun(List(1),List(a))
-List((1,a)) = zipFun(List(1),List(a,b,c))
-List((1,a)) = zipFun(List(1,2,3),List(a))
-List((1,a),(2,b)) = zipFun(List(1,2),List(a,b))
-List((1,a),(2,b)) = zipFun(List(1,2),List(a,b,c))
-List((1,a),(2,b)) = zipFun(List(1,2,3),List(a,b))
-List((1,a),(2,b),(3,c)) = zipFun(List(1,2,3),List(a,b,c))
+List({1,a}) = zipFun(List(1),List(a))
+List({1,a}) = zipFun(List(1),List(a,b,c))
+List({1,a}) = zipFun(List(1,2,3),List(a))
+List({1,a},{2,b}) = zipFun(List(1,2),List(a,b))
+List({1,a},{2,b}) = zipFun(List(1,2),List(a,b,c))
+List({1,a},{2,b}) = zipFun(List(1,2,3),List(a,b))
+List({1,a},{2,b},{3,c}) = zipFun(List(1,2,3),List(a,b,c))
List() = heads(List())
List() = heads(List(List()))
diff --git a/test/files/run/withIndex.check b/test/files/run/withIndex.check
index 75495f171b..c7ca57fb81 100644
--- a/test/files/run/withIndex.check
+++ b/test/files/run/withIndex.check
@@ -1,7 +1,8 @@
-List((a,0),(b,1),(c,2))
-List((a,0),(b,1),(c,2))
-List((a,0),(b,1),(c,2))
-List((a,0),(b,1),(c,2))
+List({a,0},{b,1},{c,2})
+List({a,0},{b,1},{c,2})
+List({a,0},{b,1},{c,2})
+List({a,0},{b,1},{c,2})
+List()
List()
List()
List()
diff --git a/test/files/run/withIndex.scala b/test/files/run/withIndex.scala
index 64e9259072..fd79cd808a 100644
--- a/test/files/run/withIndex.scala
+++ b/test/files/run/withIndex.scala
@@ -14,9 +14,11 @@ object Test {
val emptyArray = new Array[String](0)
val emptyList: List[String] = Nil
val emptyIterator = emptyList.elements
+ val emptyStream = Stream.empty
Console.println(emptyArray.zipWithIndex.toList)
Console.println(emptyList.zipWithIndex.toList)
Console.println(emptyIterator.zipWithIndex.toList)
+ Console.println(emptyStream.zipWithIndex.toList)
}
}