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

diff --git a/src/edu/berkeley/sbp/Ambiguous.java b/src/edu/berkeley/sbp/Ambiguous.java
index 56e1af7..cb55ffa 100644
--- a/src/edu/berkeley/sbp/Ambiguous.java
+++ b/src/edu/berkeley/sbp/Ambiguous.java
@@ -7,13 +7,13 @@ 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 final Forest<?> ambiguity;
+    public Ambiguous(Forest<?> ambiguity) { this.ambiguity = ambiguity; }
     public String toString() {
         StringBuffer sb = new StringBuffer();
         sb.append("unresolved ambiguity "/*"at " + ambiguity.getLocation() + ":"*/);
-        for(Object result : ambiguity.expand(false))
-            sb.append("\n    " + result);
+        for(Tree<?> result : ambiguity.expand(false))
+            sb.append("\n\n" + result.toPrettyString());
         return sb.toString();
     }
 }