Example2.2.5.6.scala fixed

Signed-off-by: Andreas Roehler <[email protected]>
winitzki · Mar 5, 2024 · 7ddd570 · 7ddd570
1 parent 03dc29f
commit 7ddd570
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 13 deletions.
diff --git a/chapter02/worksheets/Example2.2.5.6.scala b/chapter02/worksheets/Example2.2.5.6.scala
@@ -42,3 +42,10 @@ val a = toPairs(Seq("a", "b", "c"), "<nothing>")
 val b: Seq[(String, String)] = List(("a","b"), ("c","<nothing>"))
 assert(a == b) 
 
+// scala> :load Example2.2.5.6.scala
+// :load Example2.2.5.6.scala
+// def toPairs[A](xs: Seq[A], default: A): Seq[(A, A)]
+// val result: Seq[(Int, Int)] = List((1,2), (3,4), (5,6))
+// val expected: Seq[(Int, Int)] = List((1,2), (3,4), (5,6))
+// val a: Seq[(String, String)] = List((a,b), (c,<nothing>))
+// val b: Seq[(String, String)] = List((a,b), (c,<nothing>))
diff --git a/chapter02/worksheets/Example2.2.5.6_object.scala b/chapter02/worksheets/Example2.2.5.6_object.scala
@@ -40,10 +40,18 @@ object ToPairsObject {
   }
 }
 
-val result = toPairs(Seq(1, 2, 3, 4, 5, 6), -1)
+val result = ToPairsObject.toPairs(Seq(1, 2, 3, 4, 5, 6), -1)
 val expected: Seq[(Int, Int)] = List((1,2), (3,4), (5,6))
 assert(result == expected) 
 
-val a = toPairs(Seq("a", "b", "c"), "<nothing>")
+val a = ToPairsObject.toPairs(Seq("a", "b", "c"), "<nothing>")
 val b: Seq[(String, String)] = List(("a","b"), ("c","<nothing>"))
 assert(a == b) 
+
+// scala> :load Example2.2.5.6_object.scala
+// :load Example2.2.5.6_object.scala
+// // defined object ToPairsObject
+// val result: Seq[(Int, Int)] = List((1,2), (3,4), (5,6))
+// val expected: Seq[(Int, Int)] = List((1,2), (3,4), (5,6))
+// val a: Seq[(String, String)] = List((a,b), (c,<nothing>))
+// val b: Seq[(String, String)] = List((a,b), (c,<nothing>))
diff --git a/chapter02/worksheets/Example2.2.5.6_object_main.scala b/chapter02/worksheets/Example2.2.5.6_object_main.scala
@@ -45,10 +45,18 @@ object ToPairsObject {
   }
 }
 
-val result = toPairs(Seq(1, 2, 3, 4, 5, 6), -1)
+val result = ToPairsObject.toPairs(Seq(1, 2, 3, 4, 5, 6), -1)
 val expected: Seq[(Int, Int)] = List((1,2), (3,4), (5,6))
 assert(result == expected) 
 
-val a = toPairs(Seq("a", "b", "c"), "<nothing>")
+val a = ToPairsObject.toPairs(Seq("a", "b", "c"), "<nothing>")
 val b: Seq[(String, String)] = List(("a","b"), ("c","<nothing>"))
 assert(a == b) 
+
+// scala> :load Example2.2.5.6_object_main.scala
+// :load Example2.2.5.6_object_main.scala
+// // defined object ToPairsObject
+// val result: Seq[(Int, Int)] = List((1,2), (3,4), (5,6))
+// val expected: Seq[(Int, Int)] = List((1,2), (3,4), (5,6))
+// val a: Seq[(String, String)] = List((a,b), (c,<nothing>))
+// val b: Seq[(String, String)] = List((a,b), (c,<nothing>))
diff --git a/chapter02/worksheets/Example2.2.5.6_object_main_privat.scala b/chapter02/worksheets/Example2.2.5.6_object_main_privat.scala
@@ -40,16 +40,15 @@ object ToPairsObject {
 
   }
   def main(args: Array[String]): Unit = {
-    val result = ToPairsObject.toPairs(Seq(1, 2, 3), 4)
-    assert(result == expected) 
+    val result = toPairs(Seq(1, 2, 3, 4, 5, 6), -1)
+    val expected: Seq[(Int, Int)] = List((1,2), (3,4), (5,6))
+    assert(result == expected)
+
+    val a = toPairs(Seq("a", "b", "c"), "<nothing>")
+    val b: Seq[(String, String)] = List(("a","b"), ("c","<nothing>"))
+    assert(a == b)
     println("a: %s".format(a))
   }
-}
 
-val result = toPairs(Seq(1, 2, 3, 4, 5, 6), -1)
-val expected: Seq[(Int, Int)] = List((1,2), (3,4), (5,6))
-assert(result == expected) 
+}
 
-val a = toPairs(Seq("a", "b", "c"), "<nothing>")
-val b: Seq[(String, String)] = List(("a","b"), ("c","<nothing>"))
-assert(a == b)