diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/files/jvm/serialization.check | 32 | ||||
-rw-r--r-- | test/files/jvm/xmlstuff.scala | 2 | ||||
-rw-r--r-- | test/files/run/Course-2002-04.check | 84 | ||||
-rw-r--r-- | test/files/run/Course-2002-05.check | 52 | ||||
-rw-r--r-- | test/files/run/Course-2002-07.check | 112 | ||||
-rw-r--r-- | test/files/run/Course-2002-07.scala | 50 | ||||
-rw-r--r-- | test/files/run/Course-2002-08.check | 2 | ||||
-rw-r--r-- | test/files/run/Course-2002-13.check | 16 | ||||
-rw-r--r-- | test/files/run/bitsets.check | 22 | ||||
-rw-r--r-- | test/files/run/bug627.check | 2 | ||||
-rw-r--r-- | test/files/run/deeps.check | 18 | ||||
-rw-r--r-- | test/files/run/forvaleq.check | 8 | ||||
-rw-r--r-- | test/files/run/lisp.check | 2 | ||||
-rw-r--r-- | test/files/run/withIndex.check | 8 |
14 files changed, 216 insertions, 194 deletions
diff --git a/test/files/jvm/serialization.check b/test/files/jvm/serialization.check index d5fd15919f..7bd2a1524f 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 = Map(buffers -> 20, layers -> 2, title -> 3) @@ -34,20 +34,20 @@ x = Queue(a,b,c) y = Queue(a,b,c) x equals y: true - y equals x: true -x = Stack(c,b,a) -y = Stack(c,b,a) +x = Stack(c, b, a) +y = Stack(c, b, a) x equals y: true - y equals x: true x = Map(42 -> FortyTwo) y = Map(42 -> FortyTwo) x equals y: true - y equals x: true -x = Set(0, 2) -y = Set(0, 2) +x = TreeSet(0, 2) +y = TreeSet(0, 2) x equals y: true - y equals x: true -x = ArrayBuffer(one,two) -y = ArrayBuffer(one,two) +x = ArrayBuffer(one, two) +y = ArrayBuffer(one, two) x equals y: true - y equals x: true x = Map(title -> 3, buffers -> 20, layers -> 2) @@ -58,24 +58,24 @@ x = Set(0, 8, 9) y = Set(0, 8, 9) x equals y: true - y equals x: true -x = Set(layers, buffers, title) -y = Set(layers, buffers, title) +x = HashSet(layers, buffers, title) +y = HashSet(layers, buffers, title) x equals y: true - y equals x: true -x = LinkedList(2,3) -y = LinkedList(2,3) +x = LinkedList(2, 3) +y = LinkedList(2, 3) x equals y: true - y equals x: true x = Queue(20, 2, 3) y = Queue(20, 2, 3) x equals y: true - y equals x: true -x = Stack(20,2,3) -y = Stack(20,2,3) +x = Stack(20, 2, 3) +y = Stack(20, 2, 3) x equals y: true - y equals x: true -x = ListBuffer(white,black) -y = ListBuffer(white,black) +x = ListBuffer(white, black) +y = ListBuffer(white, black) x equals y: true - y equals x: true x = <html><title>title</title><body></body></html> diff --git a/test/files/jvm/xmlstuff.scala b/test/files/jvm/xmlstuff.scala index 7c66068b5a..df0e129248 100644 --- a/test/files/jvm/xmlstuff.scala +++ b/test/files/jvm/xmlstuff.scala @@ -61,7 +61,7 @@ passed ok </foo>; val pelems_1 = for( val x <- p \ "bar"; val y <- p \ "baz" ) yield { - Text(x.attributes("value").toString() + y.attributes("bazValue").toString()+ "!") + Text(x.attributes("value").toString + y.attributes("bazValue").toString+ "!") }; val pelems_2 = new NodeSeq { val theSeq = List(Text("38!"),Text("58!")) }; assertSameElements(pelems_1, pelems_2); diff --git a/test/files/run/Course-2002-04.check b/test/files/run/Course-2002-04.check index bf4218fb32..1110fd05ab 100644 --- a/test/files/run/Course-2002-04.check +++ b/test/files/run/Course-2002-04.check @@ -1,22 +1,22 @@ -list0 = List(6,3,1,8,7,1,2,5,8,4,3,4,8) -list1 = List(1,1,2,3,3,4,4,5,6,7,8,8,8) -list2 = List(1,1,2,3,3,4,4,5,6,7,8,8,8) -list3 = List(1,1,2,3,3,4,4,5,6,7,8,8,8) -list4 = List(1,1,2,3,3,4,4,5,6,7,8,8,8) -list5 = List(8,8,8,7,6,5,4,4,3,3,2,1,1) -list6 = List(8,8,8,7,6,5,4,4,3,3,2,1,1) +list0 = List(6, 3, 1, 8, 7, 1, 2, 5, 8, 4, 3, 4, 8) +list1 = List(1, 1, 2, 3, 3, 4, 4, 5, 6, 7, 8, 8, 8) +list2 = List(1, 1, 2, 3, 3, 4, 4, 5, 6, 7, 8, 8, 8) +list3 = List(1, 1, 2, 3, 3, 4, 4, 5, 6, 7, 8, 8, 8) +list4 = List(1, 1, 2, 3, 3, 4, 4, 5, 6, 7, 8, 8, 8) +list5 = List(8, 8, 8, 7, 6, 5, 4, 4, 3, 3, 2, 1, 1) +list6 = List(8, 8, 8, 7, 6, 5, 4, 4, 3, 3, 2, 1, 1) list0: List() -> List() list1: List(0) -> List(0) -list2: List(0,1) -> List(0,1) -list3: List(1,0) -> List(0,1) -list4: List(0,1,2) -> List(0,1,2) -list5: List(1,0,2) -> List(0,1,2) -list6: List(0,1,2) -> List(0,1,2) -list7: List(1,0,2) -> List(0,1,2) -list8: List(2,0,1) -> List(0,1,2) -list9: List(2,1,0) -> List(0,1,2) -listA: List(6,3,1,8,7,1,2,5,8,4) -> List(1,1,2,3,4,5,6,7,8,8) +list2: List(0, 1) -> List(0, 1) +list3: List(1, 0) -> List(0, 1) +list4: List(0, 1, 2) -> List(0, 1, 2) +list5: List(1, 0, 2) -> List(0, 1, 2) +list6: List(0, 1, 2) -> List(0, 1, 2) +list7: List(1, 0, 2) -> List(0, 1, 2) +list8: List(2, 0, 1) -> List(0, 1, 2) +list9: List(2, 1, 0) -> List(0, 1, 2) +listA: List(6, 3, 1, 8, 7, 1, 2, 5, 8, 4) -> List(1, 1, 2, 3, 4, 5, 6, 7, 8, 8) f(x) = 5x^3+7x^2+5x+9 f(0) = 9.0 @@ -24,41 +24,41 @@ f(1) = 26.0 f(2) = 87.0 f(3) = 222.0 -v1 = List(2.0,3.0,4.0) -v2 = List(6.0,7.0,8.0) +v1 = List(2.0, 3.0, 4.0) +v2 = List(6.0, 7.0, 8.0) -id = List(List(1.0,0.0,0.0),List(0.0,1.0,0.0),List(0.0,0.0,1.0)) -m1 = List(List(2.0,0.0,0.0),List(0.0,2.0,0.0),List(0.0,0.0,2.0)) -m2 = List(List(1.0,2.0,3.0),List(4.0,5.0,6.0),List(7.0,8.0,9.0)) +id = List(List(1.0, 0.0, 0.0), List(0.0, 1.0, 0.0), List(0.0, 0.0, 1.0)) +m1 = List(List(2.0, 0.0, 0.0), List(0.0, 2.0, 0.0), List(0.0, 0.0, 2.0)) +m2 = List(List(1.0, 2.0, 3.0), List(4.0, 5.0, 6.0), List(7.0, 8.0, 9.0)) v1 * v1 = 29.0 v1 * v2 = 65.0 v2 * v1 = 65.0 v1 * v2 = 65.0 -id * v1 = List(2.0,3.0,4.0) -m1 * v1 = List(4.0,6.0,8.0) -m2 * v1 = List(20.0,47.0,74.0) +id * v1 = List(2.0, 3.0, 4.0) +m1 * v1 = List(4.0, 6.0, 8.0) +m2 * v1 = List(20.0, 47.0, 74.0) -trn(id) = List(List(1.0,0.0,0.0),List(0.0,1.0,0.0),List(0.0,0.0,1.0)) -trn(m1) = List(List(2.0,0.0,0.0),List(0.0,2.0,0.0),List(0.0,0.0,2.0)) -trn(m2) = List(List(1.0,4.0,7.0),List(2.0,5.0,8.0),List(3.0,6.0,9.0)) +trn(id) = List(List(1.0, 0.0, 0.0), List(0.0, 1.0, 0.0), List(0.0, 0.0, 1.0)) +trn(m1) = List(List(2.0, 0.0, 0.0), List(0.0, 2.0, 0.0), List(0.0, 0.0, 2.0)) +trn(m2) = List(List(1.0, 4.0, 7.0), List(2.0, 5.0, 8.0), List(3.0, 6.0, 9.0)) -List(v1) * id = List(List(2.0,3.0,4.0)) -List(v1) * m1 = List(List(4.0,6.0,8.0)) -List(v1) * m2 = List(List(42.0,51.0,60.0)) +List(v1) * id = List(List(2.0, 3.0, 4.0)) +List(v1) * m1 = List(List(4.0, 6.0, 8.0)) +List(v1) * m2 = List(List(42.0, 51.0, 60.0)) -id * List(v1) = List(List(2.0,3.0,4.0),List(0.0,0.0,0.0),List(0.0,0.0,0.0)) -m1 * List(v1) = List(List(4.0,6.0,8.0),List(0.0,0.0,0.0),List(0.0,0.0,0.0)) -m2 * List(v1) = List(List(2.0,3.0,4.0),List(8.0,12.0,16.0),List(14.0,21.0,28.0)) +id * List(v1) = List(List(2.0, 3.0, 4.0), List(0.0, 0.0, 0.0), List(0.0, 0.0, 0.0)) +m1 * List(v1) = List(List(4.0, 6.0, 8.0), List(0.0, 0.0, 0.0), List(0.0, 0.0, 0.0)) +m2 * List(v1) = List(List(2.0, 3.0, 4.0), List(8.0, 12.0, 16.0), List(14.0, 21.0, 28.0)) -id * id = List(List(1.0,0.0,0.0),List(0.0,1.0,0.0),List(0.0,0.0,1.0)) -id * m1 = List(List(2.0,0.0,0.0),List(0.0,2.0,0.0),List(0.0,0.0,2.0)) -m1 * id = List(List(2.0,0.0,0.0),List(0.0,2.0,0.0),List(0.0,0.0,2.0)) -m1 * m1 = List(List(4.0,0.0,0.0),List(0.0,4.0,0.0),List(0.0,0.0,4.0)) -id * m2 = List(List(1.0,2.0,3.0),List(4.0,5.0,6.0),List(7.0,8.0,9.0)) -m2 * id = List(List(1.0,2.0,3.0),List(4.0,5.0,6.0),List(7.0,8.0,9.0)) -m1 * m2 = List(List(2.0,4.0,6.0),List(8.0,10.0,12.0),List(14.0,16.0,18.0)) -m2 * m1 = List(List(2.0,4.0,6.0),List(8.0,10.0,12.0),List(14.0,16.0,18.0)) -m2 * m2 = List(List(30.0,36.0,42.0),List(66.0,81.0,96.0),List(102.0,126.0,150.0)) +id * id = List(List(1.0, 0.0, 0.0), List(0.0, 1.0, 0.0), List(0.0, 0.0, 1.0)) +id * m1 = List(List(2.0, 0.0, 0.0), List(0.0, 2.0, 0.0), List(0.0, 0.0, 2.0)) +m1 * id = List(List(2.0, 0.0, 0.0), List(0.0, 2.0, 0.0), List(0.0, 0.0, 2.0)) +m1 * m1 = List(List(4.0, 0.0, 0.0), List(0.0, 4.0, 0.0), List(0.0, 0.0, 4.0)) +id * m2 = List(List(1.0, 2.0, 3.0), List(4.0, 5.0, 6.0), List(7.0, 8.0, 9.0)) +m2 * id = List(List(1.0, 2.0, 3.0), List(4.0, 5.0, 6.0), List(7.0, 8.0, 9.0)) +m1 * m2 = List(List(2.0, 4.0, 6.0), List(8.0, 10.0, 12.0), List(14.0, 16.0, 18.0)) +m2 * m1 = List(List(2.0, 4.0, 6.0), List(8.0, 10.0, 12.0), List(14.0, 16.0, 18.0)) +m2 * m2 = List(List(30.0, 36.0, 42.0), List(66.0, 81.0, 96.0), List(102.0, 126.0, 150.0)) diff --git a/test/files/run/Course-2002-05.check b/test/files/run/Course-2002-05.check index aa73638bcb..d41120ad48 100644 --- a/test/files/run/Course-2002-05.check +++ b/test/files/run/Course-2002-05.check @@ -1,44 +1,44 @@ -(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(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) +List(1, 2, 3, 4, 5, 6, 7, 8) List(List()) -List(List(),List(1)) -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)) +List(List(), List(1)) +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(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() queens(3) = List() -queens(4) = List(List(3,1,4,2),List(2,4,1,3)) +queens(4) = List(List(3, 1, 4, 2), List(2, 4, 1, 3)) diff --git a/test/files/run/Course-2002-07.check b/test/files/run/Course-2002-07.check index 0a378e6d20..75e956f310 100644 --- a/test/files/run/Course-2002-07.check +++ b/test/files/run/Course-2002-07.check @@ -24,71 +24,71 @@ List() = concat(List()) List() = concat(List(List())) -List() = concat(List(List(),List())) -List() = concat(List(List(),List(),List())) -List(1,2,3,4,5,6) = concat(List(List(1,2,3,4,5,6))) -List(1,2,3,4,5,6) = concat(List(List(1,2,3,4,5,6),List())) -List(1,2,3,4,5,6) = concat(List(List(1,2,3),List(4,5,6))) -List(1,2,3,4,5,6) = concat(List(List(),List(1,2,3,4,5,6))) -List(1,2,3,4,5,6) = concat(List(List(1,2,3,4,5,6),List(),List())) -List(1,2,3,4,5,6) = concat(List(List(1,2,3,4,5),List(6),List())) -List(1,2,3,4,5,6) = concat(List(List(1,2,3),List(4,5,6),List())) -List(1,2,3,4,5,6) = concat(List(List(1),List(2,3,4,5,6),List())) -List(1,2,3,4,5,6) = concat(List(List(),List(1,2,3,4,5,6),List())) -List(1,2,3,4,5,6) = concat(List(List(),List(1,2,3,4,5),List(6))) -List(1,2,3,4,5,6) = concat(List(List(),List(1,2,3),List(4,5,6))) -List(1,2,3,4,5,6) = concat(List(List(),List(1),List(2,3,4,5,6))) -List(1,2,3,4,5,6) = concat(List(List(),List(),List(1,2,3,4,5,6))) -List(1,2,3,4,5,6) = concat(List(List(1,2),List(3,4),List(5,6))) +List() = concat(List(List(), List())) +List() = concat(List(List(), List(), List())) +List(1, 2, 3, 4, 5, 6) = concat(List(List(1, 2, 3, 4, 5, 6))) +List(1, 2, 3, 4, 5, 6) = concat(List(List(1, 2, 3, 4, 5, 6), List())) +List(1, 2, 3, 4, 5, 6) = concat(List(List(1, 2, 3), List(4, 5, 6))) +List(1, 2, 3, 4, 5, 6) = concat(List(List(), List(1, 2, 3, 4, 5, 6))) +List(1, 2, 3, 4, 5, 6) = concat(List(List(1, 2, 3, 4, 5, 6), List(), List())) +List(1, 2, 3, 4, 5, 6) = concat(List(List(1, 2, 3, 4, 5), List(6), List())) +List(1, 2, 3, 4, 5, 6) = concat(List(List(1, 2, 3), List(4, 5, 6), List())) +List(1, 2, 3, 4, 5, 6) = concat(List(List(1), List(2, 3, 4, 5, 6), List())) +List(1, 2, 3, 4, 5, 6) = concat(List(List(), List(1, 2, 3, 4, 5, 6), List())) +List(1, 2, 3, 4, 5, 6) = concat(List(List(), List(1, 2, 3, 4, 5), List(6))) +List(1, 2, 3, 4, 5, 6) = concat(List(List(), List(1, 2, 3), List(4, 5, 6))) +List(1, 2, 3, 4, 5, 6) = concat(List(List(), List(1), List(2, 3, 4, 5, 6))) +List(1, 2, 3, 4, 5, 6) = concat(List(List(), List(), List(1, 2, 3, 4, 5, 6))) +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() = 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, 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())) -List() = heads(List(List(),List())) -List() = heads(List(List(),List(),List())) -List(1) = heads(List(List(1,2,3,4,5,6))) -List(1) = heads(List(List(1,2,3,4,5,6),List())) -List(1) = heads(List(List(),List(1,2,3,4,5,6))) -List(1) = heads(List(List(1,2,3,4,5,6),List(),List())) -List(1) = heads(List(List(),List(1,2,3,4,5,6),List())) -List(1) = heads(List(List(),List(),List(1,2,3,4,5,6))) -List(1,2) = heads(List(List(1),List(2,3,4,5,6),List())) -List(1,2) = heads(List(List(),List(1),List(2,3,4,5,6))) -List(1,4) = heads(List(List(1,2,3),List(4,5,6))) -List(1,4) = heads(List(List(1,2,3),List(4,5,6),List())) -List(1,4) = heads(List(List(),List(1,2,3),List(4,5,6))) -List(1,6) = heads(List(List(1,2,3,4,5),List(6),List())) -List(1,6) = heads(List(List(),List(1,2,3,4,5),List(6))) -List(1,3,5) = heads(List(List(1,2),List(3,4),List(5,6))) +List() = heads(List(List(), List())) +List() = heads(List(List(), List(), List())) +List(1) = heads(List(List(1, 2, 3, 4, 5, 6))) +List(1) = heads(List(List(1, 2, 3, 4, 5, 6), List())) +List(1) = heads(List(List(), List(1, 2, 3, 4, 5, 6))) +List(1) = heads(List(List(1, 2, 3, 4, 5, 6), List(), List())) +List(1) = heads(List(List(), List(1, 2, 3, 4, 5, 6), List())) +List(1) = heads(List(List(), List(), List(1, 2, 3, 4, 5, 6))) +List(1, 2) = heads(List(List(1), List(2, 3, 4, 5, 6), List())) +List(1, 2) = heads(List(List(), List(1), List(2, 3, 4, 5, 6))) +List(1, 4) = heads(List(List(1, 2, 3), List(4, 5, 6))) +List(1, 4) = heads(List(List(1, 2, 3), List(4, 5, 6), List())) +List(1, 4) = heads(List(List(), List(1, 2, 3), List(4, 5, 6))) +List(1, 6) = heads(List(List(1, 2, 3, 4, 5), List(6), List())) +List(1, 6) = heads(List(List(), List(1, 2, 3, 4, 5), List(6))) +List(1, 3, 5) = heads(List(List(1, 2), List(3, 4), List(5, 6))) List() = heads(List()) List() = heads(List(List())) -List() = heads(List(List(),List())) -List() = heads(List(List(),List(),List())) -List(1) = heads(List(List(1,2,3,4,5,6))) -List(1) = heads(List(List(1,2,3,4,5,6),List())) -List(1) = heads(List(List(),List(1,2,3,4,5,6))) -List(1) = heads(List(List(1,2,3,4,5,6),List(),List())) -List(1) = heads(List(List(),List(1,2,3,4,5,6),List())) -List(1) = heads(List(List(),List(),List(1,2,3,4,5,6))) -List(1,2) = heads(List(List(1),List(2,3,4,5,6),List())) -List(1,2) = heads(List(List(),List(1),List(2,3,4,5,6))) -List(1,4) = heads(List(List(1,2,3),List(4,5,6))) -List(1,4) = heads(List(List(1,2,3),List(4,5,6),List())) -List(1,4) = heads(List(List(),List(1,2,3),List(4,5,6))) -List(1,6) = heads(List(List(1,2,3,4,5),List(6),List())) -List(1,6) = heads(List(List(),List(1,2,3,4,5),List(6))) -List(1,3,5) = heads(List(List(1,2),List(3,4),List(5,6))) +List() = heads(List(List(), List())) +List() = heads(List(List(), List(), List())) +List(1) = heads(List(List(1, 2, 3, 4, 5, 6))) +List(1) = heads(List(List(1, 2, 3, 4, 5, 6), List())) +List(1) = heads(List(List(), List(1, 2, 3, 4, 5, 6))) +List(1) = heads(List(List(1, 2, 3, 4, 5, 6), List(), List())) +List(1) = heads(List(List(), List(1, 2, 3, 4, 5, 6), List())) +List(1) = heads(List(List(), List(), List(1, 2, 3, 4, 5, 6))) +List(1, 2) = heads(List(List(1), List(2, 3, 4, 5, 6), List())) +List(1, 2) = heads(List(List(), List(1), List(2, 3, 4, 5, 6))) +List(1, 4) = heads(List(List(1, 2, 3), List(4, 5, 6))) +List(1, 4) = heads(List(List(1, 2, 3), List(4, 5, 6), List())) +List(1, 4) = heads(List(List(), List(1, 2, 3), List(4, 5, 6))) +List(1, 6) = heads(List(List(1, 2, 3, 4, 5), List(6), List())) +List(1, 6) = heads(List(List(), List(1, 2, 3, 4, 5), List(6))) +List(1, 3, 5) = heads(List(List(1, 2), List(3, 4), List(5, 6))) f (x) = Prod(Var(x), Var(x)) f'(x) = Sum(Prod(Var(x), Number(1)), Prod(Var(x), Number(1))) diff --git a/test/files/run/Course-2002-07.scala b/test/files/run/Course-2002-07.scala index cfce48717c..2f40b96d4f 100644 --- a/test/files/run/Course-2002-07.scala +++ b/test/files/run/Course-2002-07.scala @@ -150,7 +150,7 @@ object M4 { } def test_concat[a](xss: List[List[a]]) = { - Console.println(concat(xss).toString() + " = concat(" + xss + ")"); // !!! .toString() + Console.println(concat(xss).toString + " = concat(" + xss + ")"); // !!! .toString } def test = { @@ -189,7 +189,7 @@ object M5 { } def test_zipFun[a,b](xs: List[a], ys: List[b]) = { - Console.println(zipFun(xs,ys).toString() + " = zipFun(" + xs + "," + ys + ")"); // !!! .toString() + Console.println(zipFun(xs,ys).toString + " = zipFun(" + xs + "," + ys + ")"); // !!! .toString } def test = { @@ -223,7 +223,7 @@ object M6 { } def test_zipFun[a,b](xs: List[a], ys: List[b]) = { - Console.println(zipFun(xs,ys).toString() + " = zipFun(" + xs + "," + ys + ")"); // !!! .toString() + Console.println(zipFun(xs,ys).toString + " = zipFun(" + xs + "," + ys + ")"); // !!! .toString } def test = { @@ -256,7 +256,7 @@ object M7 { } def test_heads[a](xss: List[List[a]]) = { - Console.println(heads(xss).toString() + " = heads(" + xss + ")"); // !!! .toString() + Console.println(heads(xss).toString + " = heads(" + xss + ")"); // !!! .toString } @@ -302,7 +302,7 @@ object M8 { } def test_heads[a](xss: List[List[a]]) = { - Console.println(heads(xss).toString() + " = heads(" + xss + ")"); // !!! .toString() + Console.println(heads(xss).toString + " = heads(" + xss + ")"); // !!! .toString } @@ -349,16 +349,16 @@ object M9 { } } case class Number(x: int) extends Expr { - override def toString() = "Number(" + x + ")"; // !!! remove ! + override def toString = "Number(" + x + ")"; // !!! remove ! } case class Var(name: String) extends Expr { - override def toString() = "Var(" + name + ")"; // !!! remove ! + override def toString = "Var(" + name + ")"; // !!! remove ! } case class Sum(e1: Expr, e2: Expr) extends Expr { - override def toString() = "Sum(" + e1 + ", " + e2 + ")"; // !!! remove ! + override def toString = "Sum(" + e1 + ", " + e2 + ")"; // !!! remove ! } case class Prod(e1: Expr, e2: Expr) extends Expr { - override def toString() = "Prod(" + e1 + ", " + e2 + ")"; // !!! remove ! + override def toString = "Prod(" + e1 + ", " + e2 + ")"; // !!! remove ! } def test = { @@ -392,19 +392,19 @@ object MA { } } case class Number(x: int) extends Expr { - override def toString() = x.toString() + override def toString = x.toString } case class Var(name: String) extends Expr { - override def toString() = name; + override def toString = name; } case class Sum(e1: Expr, e2: Expr) extends Expr { - override def toString() = e1.toString() + " + " + e2.toString(); + override def toString = e1.toString + " + " + e2.toString; } case class Prod(e1: Expr, e2: Expr) extends Expr { - override def toString() = { + override def toString = { def factorToString(e: Expr) = e match { - case Sum(_, _) => "(" + e.toString() + ")" - case _ => e.toString() + case Sum(_, _) => "(" + e.toString + ")" + case _ => e.toString } factorToString(e1) + " * " + factorToString(e2); } @@ -595,33 +595,33 @@ object MB { } case class Lit(x: int) extends Expr { - override def toString() = x.toString() + override def toString = x.toString } case class Var(name: String) extends Expr { - override def toString() = name; + override def toString = name; } case class Add(e1: Expr, e2: Expr) extends Expr { - override def toString() = e1.toString() + " + " + e2.toString(); // !!! .toString + override def toString = e1.toString + " + " + e2.toString; // !!! .toString } case class Mul(e1: Expr, e2: Expr) extends Expr { - override def toString() = { + override def toString = { def factorToString(e: Expr) = e match { - case Add(_, _) => "(" + e.toString() + ")" - case _ => e.toString() + case Add(_, _) => "(" + e.toString + ")" + case _ => e.toString } factorToString(e1) + " * " + factorToString(e2); } } case class Pow(e1: Expr, i2: int) extends Expr { - override def toString() = { + override def toString = { def factorToString(e: Expr) = e match { - case Add(_, _) => "(" + e.toString() + ")" - case Mul(_, _) => "(" + e.toString() + ")" - case _ => e.toString() + case Add(_, _) => "(" + e.toString + ")" + case Mul(_, _) => "(" + e.toString + ")" + case _ => e.toString } factorToString(e1) + "^" + i2; } diff --git a/test/files/run/Course-2002-08.check b/test/files/run/Course-2002-08.check index ec25c77524..e2a780ecb6 100644 --- a/test/files/run/Course-2002-08.check +++ b/test/files/run/Course-2002-08.check @@ -28,7 +28,7 @@ y withdraw 20 -> 10 2^3 = 8.0 1 2 3 -List(1,2,3) +List(1, 2, 3) out 0 new-value = false *** simulation started *** diff --git a/test/files/run/Course-2002-13.check b/test/files/run/Course-2002-13.check index 913c4e4edd..7664f70576 100644 --- a/test/files/run/Course-2002-13.check +++ b/test/files/run/Course-2002-13.check @@ -1,13 +1,13 @@ -List(S = jean,V = mange,A = le,D = grand,N = table) -List(S = jean,V = mange,A = le,D = grand,N = cheval) +List(S = jean, V = mange, A = le, D = grand, N = table) +List(S = jean, V = mange, A = le, D = grand, N = cheval) -List(S = jean,V = mange,A = le,D = grand,N = cheval) -List(S = jean,V = mange,A = la,D = belle,N = table) +List(S = jean, V = mange, A = le, D = grand, N = cheval) +List(S = jean, V = mange, A = la, D = belle, N = table) -List(S = jean,V = mange,A = le,D = nil,N = cheval) -List(S = jean,V = mange,A = le,D = cons(grand,nil),N = cheval) -List(S = jean,V = mange,A = le,D = cons(grand,cons(grand,nil)),N = cheval) -List(S = jean,V = mange,A = la,D = nil,N = table) +List(S = jean, V = mange, A = le, D = nil, N = cheval) +List(S = jean, V = mange, A = le, D = cons(grand,nil), N = cheval) +List(S = jean, V = mange, A = le, D = cons(grand,cons(grand,nil)), N = cheval) +List(S = jean, V = mange, A = la, D = nil, N = table) yes yes no diff --git a/test/files/run/bitsets.check b/test/files/run/bitsets.check index 01bd685eeb..5f5ccbfa6c 100644 --- a/test/files/run/bitsets.check +++ b/test/files/run/bitsets.check @@ -1,3 +1,25 @@ +/Users/mcdirmid/workspace/scala/test/files/run/bitsets.scala:33: warning: method toArray in class BitSet is deprecated + Console.println("ma0 = " + ms0.toArray.toList) + ^ +/Users/mcdirmid/workspace/scala/test/files/run/bitsets.scala:34: warning: method toArray in class BitSet is deprecated + Console.println("ma1 = " + ms1.toArray.toList) + ^ +/Users/mcdirmid/workspace/scala/test/files/run/bitsets.scala:35: warning: method toArray in class BitSet is deprecated + Console.println("ma2 = " + ms2.toArray.toList) + ^ +/Users/mcdirmid/workspace/scala/test/files/run/bitsets.scala:66: warning: method toArray in class BitSet is deprecated + Console.println("ia0 = " + is0.toArray.toList) + ^ +/Users/mcdirmid/workspace/scala/test/files/run/bitsets.scala:67: warning: method toArray in class BitSet is deprecated + Console.println("ia1 = " + is1.toArray.toList) + ^ +/Users/mcdirmid/workspace/scala/test/files/run/bitsets.scala:68: warning: method toArray in class BitSet is deprecated + Console.println("ia2 = " + is2.toArray.toList) + ^ +/Users/mcdirmid/workspace/scala/test/files/run/bitsets.scala:69: warning: method toArray in class BitSet is deprecated + Console.println("ia3 = " + is3.toArray.toList) + ^ +7 warnings found ms0 = Set(2) ms1 = Set(2) ms2 = Set(2) diff --git a/test/files/run/bug627.check b/test/files/run/bug627.check index fd4128e421..f3304eb707 100644 --- a/test/files/run/bug627.check +++ b/test/files/run/bug627.check @@ -1 +1 @@ -Array(1,2,3,4) +Array(1, 2, 3, 4) diff --git a/test/files/run/deeps.check b/test/files/run/deeps.check index 80ef1a86b5..55ae698241 100644 --- a/test/files/run/deeps.check +++ b/test/files/run/deeps.check @@ -30,47 +30,47 @@ true false false true -Array(true,false) +Array(true, false) Array(true,false) [true;false] true;false -Array([Z@0000000,[Z@0000000) +Array([Z@0000000, [Z@0000000) Array(Array(true,false),Array(true,false)) [[true;false];[true;false]] true;false;true;false -Array([[Z@0000000,[[Z@0000000) +Array([[Z@0000000, [[Z@0000000) Array(Array(Array(true,false),Array(true,false)),Array(Array(true,false),Array(true,false))) [[[true;false];[true;false]];[[true;false];[true;false]]] true;false;true;false;true;false;true;false -Array(1.0,0.0) +Array(1.0, 0.0) Array(1.0,0.0) [1.0;0.0] 1.0;0.0 -Array([D@0000000,[D@0000000) +Array([D@0000000, [D@0000000) Array(Array(1.0,0.0),Array(1.0,0.0)) [[1.0;0.0];[1.0;0.0]] 1.0;0.0;1.0;0.0 -Array([[D@0000000,[[D@0000000) +Array([[D@0000000, [[D@0000000) Array(Array(Array(1.0,0.0),Array(1.0,0.0)),Array(Array(1.0,0.0),Array(1.0,0.0))) [[[1.0;0.0];[1.0;0.0]];[[1.0;0.0];[1.0;0.0]]] 1.0;0.0;1.0;0.0;1.0;0.0;1.0;0.0 -Array(a,b) +Array(a, b) Array(a,b) [a;b] a;b -Array([Ljava.lang.String;@0000000,[Ljava.lang.String;@0000000) +Array([Ljava.lang.String;@0000000, [Ljava.lang.String;@0000000) Array(Array(a,b),Array(a,b)) [[a;b];[a;b]] a;b;a;b -Array([[Ljava.lang.String;@0000000,[[Ljava.lang.String;@0000000) +Array([[Ljava.lang.String;@0000000, [[Ljava.lang.String;@0000000) Array(Array(Array(a,b),Array(a,b)),Array(Array(a,b),Array(a,b))) [[[a;b];[a;b]];[[a;b];[a;b]]] a;b;a;b;a;b;a;b diff --git a/test/files/run/forvaleq.check b/test/files/run/forvaleq.check index 27f5269789..ec57719cb4 100644 --- a/test/files/run/forvaleq.check +++ b/test/files/run/forvaleq.check @@ -1,5 +1,5 @@ -List(2,6,10,14,18,20,22,24,26,28,30,32,34,36,38) -List(2,6,10,14,18,2,2,2,2,2,2,2,2,2,2) -List(2,6,10,14,18,20,22,24,26,28,30,32,34,36,38) -List(2,6,10,14,18,2,2,2,2,2,2,2,2,2,2) +List(2, 6, 10, 14, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38) +List(2, 6, 10, 14, 18, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2) +List(2, 6, 10, 14, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38) +List(2, 6, 10, 14, 18, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2) called 20 times diff --git a/test/files/run/lisp.check b/test/files/run/lisp.check index 8a61dd7315..64053f26d0 100644 --- a/test/files/run/lisp.check +++ b/test/files/run/lisp.check @@ -11,7 +11,7 @@ faculty(10) = 3628800 faculty(10) = 3628800 foobar = ("a" "bc" "def" "z") -List('lambda,List('x),List('+,List('*,'x,'x),1)) +List('lambda, List('x), List('+, List('*, 'x, 'x), 1)) (lambda (x) (+ (* x x) 1)) ( '(1 2 3)) = (1 2 3) diff --git a/test/files/run/withIndex.check b/test/files/run/withIndex.check index ea277e3e89..6a9c7aaadb 100644 --- a/test/files/run/withIndex.check +++ b/test/files/run/withIndex.check @@ -1,7 +1,7 @@ -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() |