projects
/
sbp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9a8ebbb
)
checkpoint
author
adam
<adam@megacz.com>
Sun, 22 Jan 2006 09:59:58 +0000
(
04:59
-0500)
committer
adam
<adam@megacz.com>
Sun, 22 Jan 2006 09:59:58 +0000
(
04:59
-0500)
darcs-hash:
20060122095958
-5007d-
49fd41dd267a3cdc6b3efd28f3fc0e33be6d0412
.gz
src/edu/berkeley/sbp/Forest.java
patch
|
blob
|
history
diff --git
a/src/edu/berkeley/sbp/Forest.java
b/src/edu/berkeley/sbp/Forest.java
index
8399053
..
7b11532
100644
(file)
--- a/
src/edu/berkeley/sbp/Forest.java
+++ b/
src/edu/berkeley/sbp/Forest.java
@@
-20,7
+20,7
@@
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(Input.Location loc, T head) {
+ public void add(Input.Location loc) {
hs.add(new Tree<T>(loc, head, toks.toArray(tree_hint)));
}
};
hs.add(new Tree<T>(loc, head, toks.toArray(tree_hint)));
}
};
@@
-67,9
+67,11
@@
public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
public TreeMaker<T> expand(final int i, final TreeMaker<T> h) {
if (singleton) {
tokens[0].visit(h, null, i);
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 if (unwrap && i==tokens.length-1) {
if (tokens[i] != null)
@@
-77,7
+79,7
@@
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(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);
int old = h.toks.size();
h.toks.add(new Tree<T>(loc, head, toks.toArray(tree_hint)));
expand(i+1, h);
@@
-119,8
+121,10
@@
public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
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;
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 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;
public void invoke(Forest.Body<T> bod, Boolean o, Integer i) {
if (i==null) {
ArrayList<Tree<T>> toks = this.toks;