X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FForest.java;h=420d655e6f7a8e4ed0419f536d68acac2a672ed8;hb=2e1b693804765471583c2d1dd0d798319493b06a;hp=7b115326c82a2ec0170078392fcd0840cfc26c4e;hpb=e02870181effb947d72e5aa91137dd0c7ff84ce1;p=sbp.git diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java index 7b11532..420d655 100644 --- a/src/edu/berkeley/sbp/Forest.java +++ b/src/edu/berkeley/sbp/Forest.java @@ -20,9 +20,9 @@ public abstract class Forest /*extends PrintableTree>*/ impl public HashSet> expand(boolean toss) { final HashSet> hs = new HashSet>(); TreeMaker ret = new TreeMaker(toss) { - public void add(Input.Location loc) { - hs.add(new Tree(loc, head, toks.toArray(tree_hint))); - } + public void start(T head, Input.Location loc) { } + public void finish(T head, Input.Location loc) { hs.add(new Tree(loc, head, toks.toArray(tree_hint))); } + public void child(Tree t) { toks.add(t); } }; visit(ret, null, null); if (toss && hs.size() > 1) throw new Ambiguous(this); @@ -39,7 +39,7 @@ public abstract class Forest /*extends PrintableTree>*/ impl // Body ////////////////////////////////////////////////////////////////////////////// protected static interface Body { - TreeMaker expand(int i, TreeMaker h); + void expand(int i, TreeMaker h); } protected static class MyBody extends Forest implements Body /* extends PrintableTree> implements */ { @@ -64,14 +64,15 @@ public abstract class Forest /*extends PrintableTree>*/ impl this.singleton = singleton; } - public TreeMaker expand(final int i, final TreeMaker h) { + public void expand(final int i, final TreeMaker h) { if (singleton) { tokens[0].visit(h, null, i); - return h; + return; } - if (i==0) h.head(tag); + if (i==0) h.start(tag, location); + if (i==tokens.length) { - h.add(/*FIXME*/null); + h.finish(tag, location); } else if (unwrap && i==tokens.length-1) { if (tokens[i] != null) @@ -79,15 +80,16 @@ public abstract class Forest /*extends PrintableTree>*/ impl } else { tokens[i].visit(new TreeMaker(h.toss) { - public void add(Input.Location loc) { + public void start(T head, Input.Location loc) { } + public void child(Tree t) { toks.add(t); } + public void finish(T head, Input.Location loc) { int old = h.toks.size(); - h.toks.add(new Tree(loc, head, toks.toArray(tree_hint))); + h.child(new Tree(loc, head, toks.toArray(tree_hint))); expand(i+1, h); while(h.toks.size() > old) h.toks.remove(h.toks.size()-1); } }, null, null); } - return h; } protected String headToString() { return null; } @@ -123,8 +125,9 @@ public abstract class Forest /*extends PrintableTree>*/ impl private boolean toss; protected T head; public TreeMaker(boolean toss) { this.toss = toss; } - public void head(T head) { this.head = head; } - public abstract void add(Input.Location loc); + public abstract void start(T head, Input.Location loc); + public abstract void finish(T head, Input.Location loc); + public abstract void child(Tree t); public void invoke(Forest.Body bod, Boolean o, Integer i) { if (i==null) { ArrayList> toks = this.toks;