projects
/
sbp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
394aab6
..
6288f1f
100644
(file)
--- a/
src/edu/berkeley/sbp/Ambiguous.java
+++ b/
src/edu/berkeley/sbp/Ambiguous.java
@@
-7,21
+7,21
@@
import java.util.*;
/** if ambiguity checking is enabled, this exception is thrown to signal that the parse was ambiguous */
public class Ambiguous extends Exception {
/** 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) {
+ public final Forest<?> ambiguity;
+ private final HashSet<Tree<?>> ht;
+ public Ambiguous(Forest<?> ambiguity, HashSet<Tree<?>> ht) {
this.ambiguity = ambiguity;
this.ambiguity = ambiguity;
+ this.ht = ht;
}
public String toString() {
}
public String toString() {
- // FEATURE: more legible printout desperately needed
+ // FIXME: print the input region that was ambiguously matched
StringBuffer sb = new StringBuffer();
StringBuffer sb = new StringBuffer();
- 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));
+ sb.append("unresolved ambiguity; shared subtrees are shown as \"*\" ");
for(Tree<?> result : ht) {
for(Tree<?> result : ht) {
- sb.append("\n\n");
- result.toPrettyString(sb);
+ sb.append("\n possibility: ");
+ StringBuffer sb2 = new StringBuffer();
+ result.toPrettyString(sb2);
+ sb.append(StringUtil.indent(sb2.toString(), 15));
}
return sb.toString();
}
}
return sb.toString();
}