checkpoint

[sbp.git] / src / edu / berkeley / sbp / Ambiguous.java

diff --git a/src/edu/berkeley/sbp/Ambiguous.java b/src/edu/berkeley/sbp/Ambiguous.java
index cb55ffa..394aab6 100644 (file)
--- a/src/edu/berkeley/sbp/Ambiguous.java
+++ b/src/edu/berkeley/sbp/Ambiguous.java
@@ -6,14 +6,23 @@ import java.io.*;
 import java.util.*;
 
 /** if ambiguity checking is enabled, this exception is thrown to signal that the parse was ambiguous */
-public class Ambiguous extends RuntimeException {
-    public final Forest<?> ambiguity;
-    public Ambiguous(Forest<?> ambiguity) { this.ambiguity = ambiguity; }
+public class Ambiguous extends Exception {
+    public final Forest ambiguity;
+    public Ambiguous(Forest ambiguity) {
+        this.ambiguity = ambiguity;
+    }
     public String toString() {
+        // FEATURE: more legible printout desperately needed
         StringBuffer sb = new StringBuffer();
-        sb.append("unresolved ambiguity "/*"at " + ambiguity.getLocation() + ":"*/);
-        for(Tree<?> result : ambiguity.expand(false))
-            sb.append("\n\n" + result.toPrettyString());
+        sb.append("unresolved ambiguity ");
+        HashSet<Forest> hf = new HashSet<Forest>();
+        ambiguity.gather(hf);
+        HashSet<Tree> ht = new HashSet<Tree>();
+        ambiguity.expand(ht, hf, new Tree(null, "...", null, false));
+        for(Tree<?> result : ht) {
+            sb.append("\n\n");
+            result.toPrettyString(sb);
+        }
         return sb.toString();
     }
 }