projects
/
sbp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e6144fb
)
checkpoint
author
adam
<adam@megacz.com>
Wed, 4 Jan 2006 10:30:03 +0000
(
05:30
-0500)
committer
adam
<adam@megacz.com>
Wed, 4 Jan 2006 10:30:03 +0000
(
05:30
-0500)
darcs-hash:
20060104103003
-5007d-
3ea9c768cc6b7e699e9f6442b10471a534fccefd
.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
3c1174e
..
0d343a9
100644
(file)
--- a/
src/edu/berkeley/sbp/GSS.java
+++ b/
src/edu/berkeley/sbp/GSS.java
@@
-213,8
+213,6
@@
class GSS {
for(Parser.Table.Reduction r : token==null ? state.getEofReductions() : state.getReductions(token))
if (r.numPop >= 1)
r.reduce(this, null, null);
for(Parser.Table.Reduction r : token==null ? state.getEofReductions() : state.getReductions(token))
if (r.numPop >= 1)
r.reduce(this, null, null);
- for(int i=0; i<where; i++)
- queueReductions(get(i), false);
}
/** FIXME */
}
/** FIXME */
@@
-235,14
+233,12
@@
class GSS {
// cache instances here as a way of avoiding
// recreating them.
if (r.numPop <= 0) continue;
// cache instances here as a way of avoiding
// recreating them.
if (r.numPop <= 0) continue;
- if (includeLongs) {
- if (r.numPop == 1) {
- Forest ret = n.cache().get(r);
- if (ret != null) r.reduce(this, n2, ret);
- else n.cache().put(r, r.reduce(this, n2, null));
- } else {
- r.reduce(this, n2, null);
- }
+ if (r.numPop == 1) {
+ Forest ret = n.cache().get(r);
+ if (ret != null) r.reduce(this, n2, ret);
+ else n.cache().put(r, r.reduce(this, n2, null));
+ } else {
+ r.reduce(this, n2, null);
}
}
}
}
}
}