checkpoint

darcs-hash:20060104102754-5007d-91bd279f856436090e878c0170612db19b95bd7a.gz

diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java
index 7bba6a6..77464c2 100644 (file)
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -116,6 +116,11 @@ class GSS {
             int num = hv.size();
             for(int i=0; i<num; i++) {
                 Node n = reducing_list[i];
             int num = hv.size();
             for(int i=0; i<num; i++) {
                 Node n = reducing_list[i];

+                n.queueEmptyReductions();
+                // INVARIANT: we never "see" a node until its parent-set is complete, modulo merges
+            }
+            for(int i=0; i<num; i++) {
+                Node n = reducing_list[i];

                 reducing_list[i] = null;
                 n.queueEmptyReductions();
                 n.queueReductions();
                 reducing_list[i] = null;
                 n.queueEmptyReductions();
                 n.queueReductions();

@@ -205,11 +210,16 @@ class GSS {
                 if (allqueued) return;
                 allqueued = true;
                 int where = parents().size();
                 if (allqueued) return;
                 allqueued = true;
                 int where = parents().size();

-                for(int i=0; i<where; i++) queueReductions(get(i));
+                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 */

-            public void queueReductions(Node n2) {
+            public void queueReductions(Node n2) { queueReductions(n2, true); }
+            public void queueReductions(Node n2, boolean includeLongs) {

                 if (!allqueued) { queueReductions(); return; }
                 Node n = this;
                 for(Parser.Table.Reduction r : token==null ? n.state.getEofReductions() : n.state.getReductions(token)) {
                 if (!allqueued) { queueReductions(); return; }
                 Node n = this;
                 for(Parser.Table.Reduction r : token==null ? n.state.getEofReductions() : n.state.getReductions(token)) {

@@ -230,7 +240,7 @@ class GSS {
                         if (ret != null) r.reduce(this, n2, ret);
                         else n.cache().put(r, r.reduce(this, n2, null));
                     } else {
                         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 (includeLongs) r.reduce(this, n2, null);

                     }
                 }
             }
                     }
                 }
             }

diff --git a/src/edu/berkeley/sbp/Parser.java b/src/edu/berkeley/sbp/Parser.java
index f37c575..dc6c1f6 100644 (file)
--- a/src/edu/berkeley/sbp/Parser.java
+++ b/src/edu/berkeley/sbp/Parser.java
@@ -310,12 +310,10 @@ public abstract class Parser<T extends Token, R> {
                 this.holder = new Forest[numPop];
             }
             public String toString() { return "[reduce " + position + "]"; }
                 this.holder = new Forest[numPop];
             }
             public String toString() { return "[reduce " + position + "]"; }

-            public Forest reduce(Forest f, GSS.Phase.Node parent, GSS.Phase.Node onlychild, GSS.Phase target, Forest rex) {
-                holder[numPop-1] = f;
-                return reduce(parent, numPop-2, rex, onlychild, target);                
-            }
+

             public Forest reduce(GSS.Phase.Node parent, GSS.Phase.Node onlychild, Forest rex) {
             public Forest reduce(GSS.Phase.Node parent, GSS.Phase.Node onlychild, Forest rex) {

-                return reduce(parent, numPop-1, rex, onlychild, parent.phase());
+                Forest ret = reduce(parent, numPop-1, rex, onlychild, parent.phase());
+                return ret;

             }
 
             private Forest zero = null;
             }
 
             private Forest zero = null;

@@ -328,11 +326,17 @@ public abstract class Parser<T extends Token, R> {
             // FIXME: this could be more elegant and/or cleaner and/or somewhere else
             private Forest reduce(GSS.Phase.Node parent, int pos, Forest rex, GSS.Phase.Node onlychild, GSS.Phase target) {
                 if (pos>=0) holder[pos] = parent.pending();
             // FIXME: this could be more elegant and/or cleaner and/or somewhere else
             private Forest reduce(GSS.Phase.Node parent, int pos, Forest rex, GSS.Phase.Node onlychild, GSS.Phase target) {
                 if (pos>=0) holder[pos] = parent.pending();

-                if (pos<=0 && rex==null) {
-                    System.arraycopy(holder, 0, position.holder, 0, holder.length);
-                    rex = position.rewrite(target.getLocation());
-                }
-                if (pos >=0) {
+                if (pos==0) {
+                    if (rex==null) {
+                        System.arraycopy(holder, 0, position.holder, 0, holder.length);
+                        rex = position.rewrite(target.getLocation());
+                    }
+                    if (onlychild != null)
+                        reduce(onlychild, pos-1, rex, null, target);
+                    else 
+                        for(GSS.Phase.Node child : parent.parents())
+                            reduce(child, pos-1, rex, null, target);
+                } else if (pos>0) {

                     if (onlychild != null)
                         reduce(onlychild, pos-1, rex, null, target);
                     else 
                     if (onlychild != null)
                         reduce(onlychild, pos-1, rex, null, target);
                     else