public InnerAmbiguous(Forest<?> f) { this.f = f; }
}
- static <T> Forest<T> leaf(Input.Region loc, T tag, Position p) { return create(loc, tag, null, false, p); }
- public static <T> Forest<T> create(Input.Region loc, T tag, Forest<T>[] tokens, boolean unwrap, Position p) {
+ static <T> Forest<T> leaf(Input.Region loc, T tag) { return create(loc, tag, null, false); }
+ public static <T> Forest<T> create(Input.Region loc, T tag, Forest<T>[] tokens, boolean unwrap) {
return new MyBody<T>(loc, tag, tokens, unwrap);
}
// Body //////////////////////////////////////////////////////////////////////////////
public boolean ambiguous() { return false; }
public /*protected*/ static class MyBody<T> extends Forest<T> implements Body<T> /* extends PrintableTree<Forest<T>> implements */ {
+ private final Input.Region location;
+ private final T tag;
+ private final Forest<T>[] tokens;
+ private final boolean unwrap;
+
public boolean isTransparent() { return false; }
public boolean isHidden() { return false; }
public GraphViz.Node toGraphViz(GraphViz gv) {
ivbc.invoke(this, b, c);
}
- private final Input.Region location;
- private final T tag;
- private final Forest<T>[] tokens;
- private final boolean unwrap;
-
private MyBody(Input.Region loc, T tag, Forest<T>[] tokens, boolean unwrap) {
this.location = loc;
this.tag = tag;
}
private void gather(TaskList tl, HashSet<Tree<T>>[] ht, HashSet<Tree<T>> target, Tree[] trees, int i) {
if (i==ht.length) {
- target.add(new Tree<T>(location, tag, trees));
+ target.add(new Tree<T>(location, tag, trees, unwrap));
return;
}
for(Tree<T> tree : ht[i]) {
+ /*
if (unwrap && i==trees.length-1) {
// I think this is wrong
Tree[] trees2 = new Tree[trees.length - 1 + tree.numChildren()];
trees2[trees.length-1+j] = tree.child(j);
target.add(new Tree<T>(location, tag, trees2));
} else {
+ */
trees[i] = tree;
gather(tl, ht, target, trees, i+1);
trees[i] = null;
- }
+ //}
}
}
public void expand(TaskList tl, HashSet<Tree<T>> ht) {
if (i==tokens.length) {
h.finish(tag, location);
+ /*
} else if (unwrap && i==tokens.length-1) {
if (tokens[i] != null)
tokens[i].visit(h, null, 0);
+ */
} else {
tokens[i].visit(new TreeBuilder<T>(h.toss) {
public void addTree(Tree<T> t) { toks.add(t); }
public void finish(T head, Input.Region loc) {
int old = h.toks.size();
- h.addTree(new Tree<T>(loc, head, toks.toArray(tree_hint)));
+ h.addTree(new Tree<T>(loc, head, toks.toArray(tree_hint), unwrap));
expand(i+1, h);
while(h.toks.size() > old) h.toks.remove(h.toks.size()-1);
}