Added show instances and toString implementations for finger trees

mperry · mperry · commit 6e5c822d6487 · 2016-06-02T22:47:03.000+10:00
diff --git a/core/src/main/java/fj/Show.java b/core/src/main/java/fj/Show.java
@@ -1,6 +1,8 @@
 package fj;
 
 import fj.data.*;
+import fj.data.fingertrees.FingerTree;
+import fj.data.fingertrees.Node;
 import fj.data.hlist.HList;
 import fj.data.vector.V2;
 import fj.data.vector.V3;
@@ -301,6 +303,44 @@ public static <A> Show<Tree<A>> treeShow(final Show<A> sa) {
     });
   }
 
+  public static <V, A> Show<fj.data.fingertrees.Digit<V, A>> digitShow(final Show<V> sv, final Show<A> sa) {
+    return show(d -> {
+      String s = d.match(
+              o -> "One(" + o.measure() + " -> " + o.value() + ")",
+              two -> "Two(" + two.measure() + " -> " + v2Show(sa).showS(two.values()) + ")",
+              three -> "Three(" + three.measure() + " -> " + v3Show(sa).showS(three.values()) + ")",
+              four -> "Four(" + four.measure() + " -> " + v4Show(sa).showS(four.values()) + ")"
+      );
+      return Stream.fromString(s);
+    });
+  }
+
+  public static <V, A> Show<Node<V, A>> nodeShow(final Show<V> sv, final Show<A> sa) {
+    return show(n -> {
+      final String s = n.match(
+          n2 -> "Node2(" + n2.measure() + " -> " + v2Show(sa).showS(n2.toVector()) + ")",
+          n3 -> "Node3(" + n3.measure() + " -> " + v3Show(sa).showS(n3.toVector()) + ")");
+      return Stream.fromString(s);
+    });
+  }
+
+  public static <V, A> Show<FingerTree<V, A>> fingerTreeShow(final Show<V> sv, final Show<A> sa) {
+
+    return show(ft -> {
+      String sep = ", ";
+      String str = ft.match(e -> "Empty()",
+              s -> "Single(" + sv.showS(ft.measure()) + " -> " + sa.showS(s.value()) + ")",
+              d -> "Deep(" + d.measure() + " -> " +
+                      digitShow(sv, sa).showS(d.prefix()) + sep +
+                      fingerTreeShow(sv, nodeShow(sv, sa)).showS(d.middle()) + sep +
+                      digitShow(sv, sa).showS(d.suffix()) +
+                      ")"
+      );
+      return Stream.fromString(str);
+    });
+  }
+
+
   public static <A> Show<Seq<A>> seqShow(final Show<A> sa) {
     return show(s -> streamShow(sa, "Seq(", ",", ")").show(s.toStream()));
   }
diff --git a/core/src/main/java/fj/data/fingertrees/Deep.java b/core/src/main/java/fj/data/fingertrees/Deep.java
@@ -520,4 +520,9 @@ private static <V, A> FingerTree<V, Node<V, Node<V, A>>> addDigits4(final Measur
       });
     });
   }
+
+  public String toString() {
+    return Show.fingerTreeShow(Show.<V>anyShow(), Show.<A>anyShow()).showS(this);
+  }
+
 }
diff --git a/core/src/main/java/fj/data/fingertrees/Digit.java b/core/src/main/java/fj/data/fingertrees/Digit.java
@@ -162,4 +162,7 @@ final Option<Digit<V, A>> init() {
 
     public abstract int length();
 
+    public String toString() {
+        return Show.digitShow(Show.<V>anyShow(), Show.<A>anyShow()).showS(this);
+    }
 }
diff --git a/core/src/main/java/fj/data/fingertrees/Empty.java b/core/src/main/java/fj/data/fingertrees/Empty.java
@@ -3,6 +3,7 @@
 import fj.F;
 import fj.P2;
 import fj.P3;
+import fj.Show;
 
 import static fj.Bottom.error;
 
@@ -81,4 +82,9 @@ public V measure() {
   @Override P3<FingerTree<V, A>, A, FingerTree<V, A>> split1(final F<V, Boolean> predicate, final V acc) {
     throw error("Splitting an empty tree");
   }
+
+  public String toString() {
+    return Show.fingerTreeShow(Show.<V>anyShow(), Show.<A>anyShow()).showS(this);
+  }
+
 }
diff --git a/core/src/main/java/fj/data/fingertrees/Four.java b/core/src/main/java/fj/data/fingertrees/Four.java
@@ -3,6 +3,7 @@
 import fj.P;
 import fj.P2;
 import fj.P3;
+import fj.Show;
 import fj.data.Option;
 import fj.data.vector.V4;
 import fj.F;
@@ -88,4 +89,9 @@ public V4<A> values() {
     public int length() {
         return 4;
     }
+
+  public String toString() {
+    return Show.digitShow(Show.<V>anyShow(), Show.<A>anyShow()).showS(this);
+  }
+
 }
diff --git a/core/src/main/java/fj/data/fingertrees/Node2.java b/core/src/main/java/fj/data/fingertrees/Node2.java
@@ -2,6 +2,7 @@
 
 import fj.P;
 import fj.P3;
+import fj.Show;
 import fj.data.Option;
 import fj.data.vector.V2;
 import fj.F;
@@ -66,4 +67,9 @@ public int length() {
     public V2<A> toVector() {
     return as;
   }
+
+  public String toString() {
+    return Show.nodeShow(Show.<V>anyShow(), Show.<A>anyShow()).showS(this);
+  }
+
 }
diff --git a/core/src/main/java/fj/data/fingertrees/Node3.java b/core/src/main/java/fj/data/fingertrees/Node3.java
@@ -2,6 +2,7 @@
 
 import fj.P;
 import fj.P3;
+import fj.Show;
 import fj.data.Option;
 import fj.data.vector.V3;
 import fj.F;
@@ -74,4 +75,9 @@ P3<Option<Digit<V, A>>, A, Option<Digit<V, A>>> split1(final F<V, Boolean> predi
   public V3<A> toVector() {
     return as;
   }
+
+  public String toString() {
+    return Show.nodeShow(Show.<V>anyShow(), Show.<A>anyShow()).showS(this);
+  }
+
 }
diff --git a/core/src/main/java/fj/data/fingertrees/One.java b/core/src/main/java/fj/data/fingertrees/One.java
@@ -4,6 +4,7 @@
 import fj.P;
 import fj.P2;
 import fj.P3;
+import fj.Show;
 import fj.data.Option;
 
 import static fj.data.Option.none;
@@ -54,4 +55,8 @@ public A value() {
     public int length() {
         return 1;
     }
+
+  public String toString() {
+    return Show.digitShow(Show.<V>anyShow(), Show.<A>anyShow()).showS(this);
+  }
 }
diff --git a/core/src/main/java/fj/data/fingertrees/Single.java b/core/src/main/java/fj/data/fingertrees/Single.java
@@ -4,8 +4,10 @@
 import fj.P;
 import fj.P2;
 import fj.P3;
+import fj.Show;
 
 import static fj.P.p;
+import static fj.Show.anyShow;
 
 /**
  * A tree with a single element.
@@ -99,4 +101,9 @@ public int length() {
   public A value() {
     return a;
   }
+
+  public String toString() {
+    return Show.fingerTreeShow(Show.<V>anyShow(), Show.<A>anyShow()).showS(this);
+  }
+
 }
diff --git a/core/src/main/java/fj/data/fingertrees/Three.java b/core/src/main/java/fj/data/fingertrees/Three.java
@@ -3,6 +3,7 @@
 import fj.P;
 import fj.P2;
 import fj.P3;
+import fj.Show;
 import fj.data.Option;
 import fj.data.vector.V3;
 import fj.F;
@@ -78,4 +79,9 @@ public V3<A> values() {
     public int length() {
         return 3;
     }
+
+  public String toString() {
+    return Show.digitShow(Show.<V>anyShow(), Show.<A>anyShow()).showS(this);
+  }
+
 }
diff --git a/core/src/main/java/fj/data/fingertrees/Two.java b/core/src/main/java/fj/data/fingertrees/Two.java
@@ -3,6 +3,7 @@
 import fj.P;
 import fj.P2;
 import fj.P3;
+import fj.Show;
 import fj.data.Option;
 import fj.data.vector.V2;
 import fj.F;
@@ -70,4 +71,8 @@ public int length() {
         return 2;
     }
 
+  public String toString() {
+    return Show.digitShow(Show.<V>anyShow(), Show.<A>anyShow()).showS(this);
+  }
+
 }
diff --git a/quickcheck/src/main/java/fj/test/Arbitrary.java b/quickcheck/src/main/java/fj/test/Arbitrary.java
@@ -62,6 +62,7 @@
 
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.PriorityQueue;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;

Original file line number	Diff line number	Diff line change
`@@ -520,4 +520,9 @@ private static <V, A> FingerTree<V, Node<V, Node<V, A>>> addDigits4(final Measur`
`520`	`520`	`});`
`521`	`521`	`});`
`522`	`522`	`}`
	`523`	`+`
	`524`	`+ public String toString() {`
	`525`	`+ return Show.fingerTreeShow(Show.<V>anyShow(), Show.<A>anyShow()).showS(this);`
	`526`	`+ }`
	`527`	`+`
`523`	`528`	`}`
Original file line number	Diff line number	Diff line change
`@@ -162,4 +162,7 @@ final Option<Digit<V, A>> init() {`
`162`	`162`
`163`	`163`	`public abstract int length();`
`164`	`164`
	`165`	`+ public String toString() {`
	`166`	`+ return Show.digitShow(Show.<V>anyShow(), Show.<A>anyShow()).showS(this);`
	`167`	`+ }`
`165`	`168`	`}`