public InnerAmbiguous(Forest<?> f) { this.f = f; }
}
- static <T> Forest<T> singleton(Input.Location loc, Position p) {
+ static <T> Forest<T> singleton(Input.Region loc, Position p) {
return create(loc, null, new Forest[] { }, false, true, p); }
- static <T> Forest<T> singleton(Input.Location loc, Forest<T> body, Position p) { return body; }
- static <T> Forest<T> leaf(Input.Location loc, T tag, Position p) { return create(loc, tag, null, false, false, p); }
- public static <T> Forest<T> create(Input.Location loc, T tag, Forest<T>[] tokens, boolean unwrap, boolean singleton, Position p) {
+ static <T> Forest<T> singleton(Input.Region loc, Forest<T> body, Position p) { return body; }
+ static <T> Forest<T> leaf(Input.Region loc, T tag, Position p) { return create(loc, tag, null, false, false, p); }
+ public static <T> Forest<T> create(Input.Region loc, T tag, Forest<T>[] tokens, boolean unwrap, boolean singleton, Position p) {
return new MyBody<T>(loc, tag, tokens, unwrap, singleton, p);
}
// Body //////////////////////////////////////////////////////////////////////////////
ivbc.invoke(this, b, c);
}
- private final Input.Location location;
+ private final Input.Region location;
private final T tag;
private final Forest<T>[] tokens;
private final boolean unwrap;
private final boolean singleton;
private final Sequence.Position reduction;
- private MyBody(Input.Location loc, T tag, Forest<T>[] tokens, boolean unwrap, boolean singleton, Position reduction) {
+ private MyBody(Input.Region loc, T tag, Forest<T>[] tokens, boolean unwrap, boolean singleton, Position reduction) {
this.location = loc;
this.tag = tag;
this.tokens = tokens==null ? emptyForestArray : new Forest[tokens.length];
}
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>(null, tag, trees));
+ target.add(new Tree<T>(location, tag, trees));
return;
}
for(Tree<T> tree : ht[i]) {
System.arraycopy(trees, 0, trees2, 0, trees.length-1);
for(int j=0; j<tree.numChildren(); j++)
trees2[trees.length-1+j] = tree.child(j);
- target.add(new Tree<T>(null, tag, trees2));
+ target.add(new Tree<T>(location, tag, trees2));
} else {
trees[i] = tree;
gather(tl, ht, target, trees, i+1);
} else {
tokens[i].visit(new TreeBuilder<T>(h.toss) {
- public void start(T head, Input.Location loc) { }
+ public void start(T head, Input.Region loc) { }
public void addTree(Tree<T> t) { toks.add(t); }
- public void finish(T head, Input.Location loc) {
+ public void finish(T head, Input.Region loc) {
int old = h.toks.size();
h.addTree(new Tree<T>(loc, head, toks.toArray(tree_hint)));
expand(i+1, h);