X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FAmbiguous.java;h=1acd8cd19ec85cc948513746241db7929c9c99ef;hp=1f7cc3880dc2906b6a4b81ccebcbcf0275d516e0;hb=75d0fa39d405292f4b831a6d1743f2aeea01ebd4;hpb=6b24a8ff6410a47d7290c2b42587fd8a8c5341e8

diff --git a/src/edu/berkeley/sbp/Ambiguous.java b/src/edu/berkeley/sbp/Ambiguous.java
index 1f7cc38..1acd8cd 100644
--- a/src/edu/berkeley/sbp/Ambiguous.java
+++ b/src/edu/berkeley/sbp/Ambiguous.java
@@ -7,15 +7,24 @@ import java.util.*;
 
 /** if ambiguity checking is enabled, this exception is thrown to signal that the parse was ambiguous */
 public class Ambiguous extends Exception {
-    public final Forest<?> ambiguity;
-    public Ambiguous(Forest<?> ambiguity) { this.ambiguity = ambiguity; }
+    final Forest<?> ambiguity;
+    private final HashSet<Tree<?>> ht;
+    Ambiguous(Forest<?> ambiguity, HashSet<Tree<?>> ht) {
+        this.ambiguity = ambiguity;
+        this.ht = ht;
+    }
+
+    public Forest<?> getAmbiguity() { return ambiguity; }
+
     public String toString() {
-        // FEATURE: more legible printout desperately needed
+        // FIXME: print the input region that was ambiguously matched
         StringBuffer sb = new StringBuffer();
-        sb.append("unresolved ambiguity ");
-        for(Tree<?> result : ambiguity.expand(false)) {
-            sb.append("\n\n");
-            result.toPrettyString(sb);
+        sb.append("unresolved ambiguity; shared subtrees are shown as \"*\" ");
+        for(Tree<?> result : ht) {
+            sb.append("\n  possibility: ");
+            StringBuffer sb2 = new StringBuffer();
+            result.toPrettyString(sb2);
+            sb.append(StringUtil.indent(sb2.toString(), 15));
         }
         return sb.toString();
     }