Change 'internal::prettyPairs' to take show instances

effekt-lang · Dec 13, 2024 · fd5b9b3 · fd5b9b3
1 parent 12f7061
commit fd5b9b3
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/examples/stdlib/map/counter.effekt b/examples/stdlib/map/counter.effekt
@@ -35,5 +35,5 @@ def main() = {
   test("do")
   test("Effekt")
 
-  println(map::internal::prettyPairs(ctr.toList))
+  println(map::internal::prettyPairs(ctr.toList) { s => show(s) } { n => show(n) })
 }
diff --git a/examples/stdlib/map/map.effekt b/examples/stdlib/map/map.effekt
@@ -4,25 +4,25 @@ def main() = {
     val l = [(0, "Hello"), (1, "World"), (2, "Woo!")]
 
     val m = map::fromList(l, compareInt)
-    println(map::internal::prettyPairs(m.toList))
+    println(map::internal::prettyPairs(m.toList) { n => show(n) } { s => show(s) })
 
     val m2 = m.put(-1, "Hullo")
-    println(map::internal::prettyPairs(m2.toList))
+    println(map::internal::prettyPairs(m2.toList) { n => show(n) } { s => show(s) })
 
     val m3 = m2.put(-10, "EY")
-    println(map::internal::prettyPairs(m3.toList))
+    println(map::internal::prettyPairs(m3.toList) { n => show(n) } { s => show(s) })
 
     // ...
 
     val m4 = m.delete(1).put(42, "Whole new world!").put(100, "Big").put(1000, "Bigger").put(10000, "Biggest!")
-    println(map::internal::prettyPairs(m4.toList))
+    println(map::internal::prettyPairs(m4.toList) { n => show(n) } { s => show(s) })
 
     val m5 = map::fromList(Cons((1, "Foo"), Cons((-1, "Huh?!"), m4.toList.reverse)), compareInt)
-    println(map::internal::prettyPairs(m5.toList))
+    println(map::internal::prettyPairs(m5.toList) { n => show(n) } { s => show(s) })
 
     val m6: Map[Int, String] = m5.toList.fromList(compareInt)
-    println(map::internal::prettyPairs(m6.toList))
+    println(map::internal::prettyPairs(m6.toList) { n => show(n) } { s => show(s) })
 
     val nuMap = map::fromList(l.reverse, compareInt)
-    println(map::internal::prettyPairs(nuMap.toList))
+    println(map::internal::prettyPairs(nuMap.toList) { n => show(n) } { s => show(s) })
 }
diff --git a/examples/stdlib/map/setops.effekt b/examples/stdlib/map/setops.effekt
@@ -7,14 +7,14 @@ def main() = {
 
   // Test union with different combine strategies
   println("Union (keeping first value):")
-  println(map::internal::prettyPairs(map1.union(map2).toList))
+  println(map::internal::prettyPairs(map1.union(map2).toList) { n => show(n) } { s => show(s) })
 
   println("\nUnion (combining values):")
   val combinedMap = map1.union(map2, compareInt) { (k, v1, v2) => v1 ++ "/" ++ v2 }
-  println(map::internal::prettyPairs(combinedMap.toList))
+  println(map::internal::prettyPairs(combinedMap.toList) { n => show(n) } { s => show(s) })
 
   // Test intersection
   println("\nIntersection (combining keys):")
   val intersectedMap = map1.intersection(map2, compareInt) { (k, v1, v2) => v1 ++ "-" ++ v2 }
-  println(map::internal::prettyPairs(intersectedMap.toList))
+  println(map::internal::prettyPairs(intersectedMap.toList) { n => show(n) } { s => show(s) })
 }
diff --git a/examples/stdlib/stream/map.effekt b/examples/stdlib/stream/map.effekt
@@ -9,7 +9,7 @@ def main() = {
   }
 
   val newMap = collectMap[Int, Char](compareInt) { each(m) }
-  println(map::internal::prettyPairs(newMap.toList))
+  println(map::internal::prettyPairs(newMap.toList) { n => show(n) } { c => show(c) })
 
   val hello: String = collectString { eachValue(m) }
   println(hello)

diff --git a/libraries/common/map.effekt b/libraries/common/map.effekt
@@ -960,6 +960,7 @@ namespace internal {
 
   // Section: prettyprinting for trees:
 
+  /// Works only on the backends that support `genericShow` (JavaScript)!
   def prettyTree[K, V](m: Tree[K, V]): String = {
     // Helper function to recursively build the string representation of the tree
     def go(t: Tree[K, V], prefix: String, isTail: Bool): String = {
@@ -981,9 +982,9 @@ namespace internal {
     go(m, "", true)
   }
 
-  def prettyPairs[K, V](list: List[(K, V)]): String = {
+  def prettyPairs[K, V](list: List[(K, V)]) { showLeft: K => String } { showRight: V => String }: String = {
     val res: String =
-      list.map { case (k, v) => k.genericShow ++ " → " ++ v.genericShow }
+      list.map { case (k, v) => showLeft(k) ++ " → " ++ showRight(v) }
           .join(", ")
 
     "[" ++ res ++ "]"