X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FAmbiguous.java;h=1acd8cd19ec85cc948513746241db7929c9c99ef;hb=cd8ef445dd069efec7d47ab1df0c1f93caa2beac;hp=56e1af7a53099b30a27c88582c6e6e8faedc2945;hpb=a22c5074e705e3ffcf03e9f9d174aed8ef79fc91;p=sbp.git

diff --git a/src/edu/berkeley/sbp/Ambiguous.java b/src/edu/berkeley/sbp/Ambiguous.java
index 56e1af7..1acd8cd 100644
--- a/src/edu/berkeley/sbp/Ambiguous.java
+++ b/src/edu/berkeley/sbp/Ambiguous.java
@@ -6,14 +6,26 @@ 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 {
+    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() {
+        // FIXME: print the input region that was ambiguously matched
         StringBuffer sb = new StringBuffer();
-        sb.append("unresolved ambiguity "/*"at " + ambiguity.getLocation() + ":"*/);
-        for(Object result : ambiguity.expand(false))
-            sb.append("\n    " + result);
+        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();
     }
 }