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
/
GSS.java
diff --git
a/src/edu/berkeley/sbp/GSS.java
b/src/edu/berkeley/sbp/GSS.java
index
0b6064d
..
7bba6a6
100644
(file)
--- a/
src/edu/berkeley/sbp/GSS.java
+++ b/
src/edu/berkeley/sbp/GSS.java
@@
-191,7
+191,7
@@
class GSS {
public final Parser.Table.State state;
/** which Phase this Node belongs to (node that Node is also a non-static inner class of Phase) */
public final Parser.Table.State state;
/** which Phase this Node belongs to (node that Node is also a non-static inner class of Phase) */
- public final Phase phase = Phase.this;
+ public Phase phase() { return Phase.this; }
public HashMap<Parser.Table.Reduction,Forest> cache() {
return cache==null ? (cache = new HashMap<Parser.Table.Reduction,Forest>()) : cache;
public HashMap<Parser.Table.Reduction,Forest> cache() {
return cache==null ? (cache = new HashMap<Parser.Table.Reduction,Forest>()) : cache;
@@
-227,10
+227,10
@@
class GSS {
if (r.numPop <= 0) continue;
if (r.numPop == 1) {
Forest ret = n.cache().get(r);
if (r.numPop <= 0) continue;
if (r.numPop == 1) {
Forest ret = n.cache().get(r);
- if (ret != null) r.reduce(n, n2, n.phase, ret);
- else n.cache().put(r, r.reduce(n, n2, n.phase, null));
+ if (ret != null) r.reduce(this, n2, ret);
+ else n.cache().put(r, r.reduce(this, n2, null));
} else {
} else {
- r.reduce(n, n2, Phase.this, null);
+ r.reduce(this, n2, null);
}
}
}
}
}
}
@@
-241,7
+241,7
@@
class GSS {
if (reducing)
for(Parser.Table.Reduction r : token==null ? state.getEofReductions() : state.getReductions(token))
if (r.numPop==0)
if (reducing)
for(Parser.Table.Reduction r : token==null ? state.getEofReductions() : state.getReductions(token))
if (r.numPop==0)
- r.reduce(this, null, this.phase, r.zero());
+ r.reduce(this, null, r.zero());
}
private Node(Node parent, Forest pending, Parser.Table.State state, Phase start) {
}
private Node(Node parent, Forest pending, Parser.Table.State state, Phase start) {