public HashSet<Tree<T>> expand(boolean toss) {
final HashSet<Tree<T>> hs = new HashSet<Tree<T>>();
TreeMaker<T> ret = new TreeMaker<T>(toss) {
- public void add(Input.Location loc, T head) {
+ public void add(Input.Location loc) {
hs.add(new Tree<T>(loc, head, toks.toArray(tree_hint)));
}
};
public TreeMaker<T> expand(final int i, final TreeMaker<T> h) {
if (singleton) {
tokens[0].visit(h, null, i);
-
- } else if (i==tokens.length) {
- h.add(/*FIXME*/null, tag);
+ return h;
+ }
+ if (i==0) h.head(tag);
+ if (i==tokens.length) {
+ h.add(/*FIXME*/null);
} else if (unwrap && i==tokens.length-1) {
if (tokens[i] != null)
} else {
tokens[i].visit(new TreeMaker<T>(h.toss) {
- public void add(Input.Location loc, T head) {
+ public void add(Input.Location loc) {
int old = h.toks.size();
h.toks.add(new Tree<T>(loc, head, toks.toArray(tree_hint)));
expand(i+1, h);
private static abstract class TreeMaker<T> implements Invokable<Forest.Body<T>,Boolean,Integer> {
public ArrayList<Tree<T>> toks = new ArrayList<Tree<T>>();
private boolean toss;
+ protected T head;
public TreeMaker(boolean toss) { this.toss = toss; }
- public abstract void add(Input.Location loc, T head);
+ public void head(T head) { this.head = head; }
+ public abstract void add(Input.Location loc);
public void invoke(Forest.Body<T> bod, Boolean o, Integer i) {
if (i==null) {
ArrayList<Tree<T>> toks = this.toks;