projects
/
sbp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4519f5e
)
checkpoint harmony
author
adam
<adam@megacz.com>
Wed, 11 Jan 2006 07:22:56 +0000
(
02:22
-0500)
committer
adam
<adam@megacz.com>
Wed, 11 Jan 2006 07:22:56 +0000
(
02:22
-0500)
darcs-hash:
20060111072256
-5007d-
b85e9fbb2135c9a52c6739aee74e006bbef7633e
.gz
src/edu/berkeley/sbp/GSS.java
patch
|
blob
|
history
diff --git
a/src/edu/berkeley/sbp/GSS.java
b/src/edu/berkeley/sbp/GSS.java
index
8c7b2db
..
4f8b4a9
100644
(file)
--- a/
src/edu/berkeley/sbp/GSS.java
+++ b/
src/edu/berkeley/sbp/GSS.java
@@
-140,7
+140,7
@@
class GSS {
//return;
} while(false);
//return;
} while(false);
- Node n = new Node(parent, pending, state, fromEmptyReduction); // ALLOC
+ Node n = new Node(parent, pending, state); // ALLOC
if (reducing) {
n.queueEmptyReductions();
if (!fromEmptyReduction) n.queueReductions(parent);
if (reducing) {
n.queueEmptyReductions();
if (!fromEmptyReduction) n.queueReductions(parent);
@@
-267,7
+267,6
@@
class GSS {
public FastSet<Node> parents() { return this; }
public void queueReductions() {
public FastSet<Node> parents() { return this; }
public void queueReductions() {
- if (!reducing) return;
if (allqueued) return;
allqueued = true;
state.invokeReductions(token, this, this, null);
if (allqueued) return;
allqueued = true;
state.invokeReductions(token, this, this, null);
@@
-285,16
+284,11
@@
class GSS {
else if (n2==null) r.reduce(n);
else r.reduce(n, n2);
}
else if (n2==null) r.reduce(n);
else r.reduce(n, n2);
}
- public void queueEmptyReductions() {
- if (!reducing) return;
- state.invokeReductions(token, this, null, null);
- }
+ public void queueEmptyReductions() { state.invokeReductions(token, this, null, null); }
- private boolean fe;
public boolean dead = false;
public boolean redo = false;
public boolean dead = false;
public boolean redo = false;
- private Node(Node parent, Forest pending, State state, boolean fe) {
- this.fe = fe;
+ private Node(Node parent, Forest pending, State state) {
this.state = state;
this.holder().merge(pending);
Phase start = parent==null ? null : parent.phase();
this.state = state;
this.holder().merge(pending);
Phase start = parent==null ? null : parent.phase();