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
/
Forest.java
diff --git
a/src/edu/berkeley/sbp/Forest.java
b/src/edu/berkeley/sbp/Forest.java
index
5807545
..
8399053
100644
(file)
--- a/
src/edu/berkeley/sbp/Forest.java
+++ b/
src/edu/berkeley/sbp/Forest.java
@@
-20,7
+20,9
@@
public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
public HashSet<Tree<T>> expand(boolean toss) {
final HashSet<Tree<T>> hs = new HashSet<Tree<T>>();
TreeMaker<T> ret = new TreeMaker<T>(toss) {
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(Tree<T> t) { hs.add(t); }
+ public void add(Input.Location loc, T head) {
+ hs.add(new Tree<T>(loc, head, toks.toArray(tree_hint)));
+ }
};
visit(ret, null, null);
if (toss && hs.size() > 1) throw new Ambiguous(this);
};
visit(ret, null, null);
if (toss && hs.size() > 1) throw new Ambiguous(this);
@@
-40,7
+42,7
@@
public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
TreeMaker<T> expand(int i, TreeMaker<T> h);
}
TreeMaker<T> expand(int i, TreeMaker<T> h);
}
- protected static class MyBody<T> extends Forest<T> implements Body<T> /* extends PrintableTree<Forest<T>> implements */, Invokable<Tree<T>, TreeMaker<T>, Integer> {
+ protected static class MyBody<T> extends Forest<T> implements Body<T> /* extends PrintableTree<Forest<T>> implements */ {
public <B,C> void visit(Invokable<Forest.Body<T>,B,C> ivbc, B b, C c) {
ivbc.invoke(this, b, c);
public <B,C> void visit(Invokable<Forest.Body<T>,B,C> ivbc, B b, C c) {
ivbc.invoke(this, b, c);
@@
-67,7
+69,7
@@
public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
tokens[0].visit(h, null, i);
} else if (i==tokens.length) {
tokens[0].visit(h, null, i);
} else if (i==tokens.length) {
- h.add(new Tree<T>(null, tag, h.toks.toArray(tree_hint)));
+ h.add(/*FIXME*/null, tag);
} else if (unwrap && i==tokens.length-1) {
if (tokens[i] != null)
} else if (unwrap && i==tokens.length-1) {
if (tokens[i] != null)
@@
-75,9
+77,9
@@
public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
} else {
tokens[i].visit(new TreeMaker<T>(h.toss) {
} else {
tokens[i].visit(new TreeMaker<T>(h.toss) {
- public void add(Tree<T> r) {
+ public void add(Input.Location loc, T head) {
int old = h.toks.size();
int old = h.toks.size();
- h.toks.add(r);
+ h.toks.add(new Tree<T>(loc, head, toks.toArray(tree_hint)));
expand(i+1, h);
while(h.toks.size() > old) h.toks.remove(h.toks.size()-1);
}
expand(i+1, h);
while(h.toks.size() > old) h.toks.remove(h.toks.size()-1);
}
@@
-85,14
+87,6
@@
public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
}
return h;
}
}
return h;
}
- public void invoke(Tree<T> r, TreeMaker<T> h, Integer i) {
- //hit = true;
- int old = h.toks.size();
- h.toks.add(r);
- expand(i+1, h);
- while(h.toks.size() > old) h.toks.remove(h.toks.size()-1);
- //ivbc.invoke(this, b, c);
- }
protected String headToString() { return null; }
protected String headToJava() { return null; }
protected String headToString() { return null; }
protected String headToJava() { return null; }
@@
-126,7
+120,7
@@
public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
public ArrayList<Tree<T>> toks = new ArrayList<Tree<T>>();
private boolean toss;
public TreeMaker(boolean toss) { this.toss = toss; }
public ArrayList<Tree<T>> toks = new ArrayList<Tree<T>>();
private boolean toss;
public TreeMaker(boolean toss) { this.toss = toss; }
- public abstract void add(Tree<T> t);
+ public abstract void add(Input.Location loc, T head);
public void invoke(Forest.Body<T> bod, Boolean o, Integer i) {
if (i==null) {
ArrayList<Tree<T>> toks = this.toks;
public void invoke(Forest.Body<T> bod, Boolean o, Integer i) {
if (i==null) {
ArrayList<Tree<T>> toks = this.toks;