X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FGSS.java;h=16725f1911d4d3e79d043929a6f96f2fbe658036;hp=3c1174eb697df0ddd3aa5160b8435021112b6700;hb=f33c05adc5aa3dd324c5352cdbd6f4b55359acad;hpb=e6144fba714756c987f2e7c99b9cca4cd54f7583

diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java
index 3c1174e..16725f1 100644
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -1,7 +1,5 @@
 package edu.berkeley.sbp;
 import edu.berkeley.sbp.*;
-import edu.berkeley.sbp.*;
-import edu.berkeley.sbp.*;
 import edu.berkeley.sbp.util.*;
 import java.io.*;
 import java.util.*;
@@ -30,7 +28,7 @@ class GSS {
     private Phase.Node[] reducing_list = null;
 
     /** corresponds to a positions <i>between tokens</i> the input stream; same as Tomita's U_i's */
-    public class Phase {
+    public class Phase implements Invokable<Parser.Table.State, Forest, GSS.Phase.Node> {
 
         /** the token immediately after this phase */
         public  final Token token;
@@ -75,32 +73,30 @@ class GSS {
          *  @param fromEmptyReduction true iff this node is being created as a result of a reduction of length zero (see GRMLR paper)
          *  @param start              the earliest part of the input contributing to this node (used to make merging decisions)
          */
-        public void newNode(Node parent, Forest pending, Parser.Table.State state, boolean fromEmptyReduction, Phase start) {
-            Node p = hash.get(code(state, start));
-            if (p != null)  newNode2(p, parent, pending, state, fromEmptyReduction, start);
-            else            newNode3(parent, pending, state, fromEmptyReduction, start);
+        public void newNode(Node parent, Forest pending, Parser.Table.State state, boolean fromEmptyReduction) {
+            Node p = hash.get(code(state, parent==null?null:parent.phase()));
+            if (p != null)  newNode2(p, parent, pending, state, fromEmptyReduction);
+            else            newNode3(parent, pending, state, fromEmptyReduction);
         }
-        private void newNode2(Node p, Node parent, Forest pending, Parser.Table.State state, boolean fromEmptyReduction, Phase start) {
+        private void newNode2(Node p, Node parent, Forest pending, Parser.Table.State state, boolean fromEmptyReduction) {
             p.holder.merge(pending);
             if (p.parents().contains(parent)) return;
-            p.addParent(parent, fromEmptyReduction);
+            p.parents().add(parent);
+            if (p!=parent && !fromEmptyReduction) p.queueReductions(parent);
         }
-        private void newNode3(Node parent, Forest pending, Parser.Table.State state, boolean fromEmptyReduction, Phase start) {
+        private void newNode3(Node parent, Forest pending, Parser.Table.State state, boolean fromEmptyReduction) {
             do {
                 if (token != null && state.canShift(token)) break;
                 if (state.isAccepting()) break;
                 if (token==null) break;
-                int count = 0;
-                Parser.Table.Reduction r = null;
-                for(Parser.Table.Reduction red : token==null ? state.getEofReductions() : state.getReductions(token)) { r = red; count++; }
-                if (count==0) return;     // BEWARE! this optimization is suspected to cause really nasty heisenbugs
+                if (!state.canReduce(token)) return;
                 //if (count > 1) break;
                 //if (r.numPop == 0) break;
                 //r.reduce(pending, parent, null, Phase.this, null);
                 //return;
             } while(false);
 
-            Node n = new Node(parent, pending, state, start);  // ALLOC
+            Node n = new Node(parent, pending, state);  // ALLOC
             n.queueEmptyReductions();
             if (!fromEmptyReduction) n.queueReductions(parent);
         }
@@ -122,13 +118,18 @@ class GSS {
             for(int i=0; i<num; i++) {
                 Node n = reducing_list[i];
                 reducing_list[i] = null;
-                n.queueEmptyReductions();
                 n.queueReductions();
             }
         }
 
+        public void invoke(Parser.Table.State st, Forest result, Node n) {
+            next.newNode(n, result, st, true);
+        }
+        private Phase next = null;
+
         /** perform all shift operations, adding promoted nodes to <tt>next</tt> */
         public void shift(Phase next, Forest result) {
+            this.next = next;
             closed = true;
             Forest res = null;
             boolean ok = false;
@@ -142,11 +143,14 @@ class GSS {
                 }
                 if (!n.holder.valid()) continue;
                 if (token == null) continue;
+                n.state.invokeShifts(token, this, result, n);
+                /*
                 for(Parser.Table.State st : n.state.getShifts(token)) {
                     if (res == null) res = result;
                     next.newNode(n, res, st, true, this);
                     ok = true;
                 }
+                */
             }
 
             if (!ok && token != null) {
@@ -177,89 +181,52 @@ class GSS {
         // GSS Nodes //////////////////////////////////////////////////////////////////////////////
 
         /** a node in the GSS */
-        public final class Node extends FastSet<Node> {
-
-            public void addParent(Node parent, boolean fromEmptyReduction) {
-                parents().add(parent, true);
-                if (this!=parent && !fromEmptyReduction) queueReductions(parent);
-            }
+        public final class Node extends FastSet<Node> implements Invokable<Parser.Table.Reduction, Node, Node> {
 
             private Forest.Ref holder = null;
             private boolean allqueued = false;
 
-            private HashMap<Parser.Table.Reduction,Forest> cache = null;
-
-            /** the set of nodes to which there is an edge starting at this node */
-            //public final FastSet<Node> parents = new FastSet<Node>();  /* ALLOC */
-
             /** what state this node is in */
             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 Phase phase() { return Phase.this; }
 
-            public  HashMap<Parser.Table.Reduction,Forest> cache() {
-                return cache==null ? (cache = new HashMap<Parser.Table.Reduction,Forest>()) : cache;
-            }
             public  Forest.Ref holder() { return holder==null ? (holder = new Forest.Ref()) : holder; }
             public  Forest pending() { return Phase.this.closed ? holder().resolve() : holder; }
             public  FastSet<Node> parents() { return this; }
 
-            /** FIXME */
             public void queueReductions() {
                 if (allqueued) return;
                 allqueued = true;
                 int where = parents().size();
-                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);
+                state.invokeReductions(token, this, this, null);
             }
 
-            /** FIXME */
-            public void queueReductions(Node n2) { queueReductions(n2, true); }
-            public void queueReductions(Node n2, boolean includeLongs) {
+            public void queueReductions(Node n2) {
                 if (!allqueued) { queueReductions(); return; }
-                Node n = this;
-                for(Parser.Table.Reduction r : token==null ? n.state.getEofReductions() : n.state.getReductions(token)) {
-                    
-                    // UGLY HACK
-                    // The problem here is that a "reduction of length 1"
-                    // performed twice with different values of n2 needs
-                    // to only create a *single* new result, but must add
-                    // multiple parents to the node holding that result.
-                    // The current reducer doesn't differentiate between
-                    // the next node of an n-pop reduction and the
-                    // ultimate parent of the last pop, so we need to
-                    // 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);
-                        }
-                    }
-                }
+                state.invokeReductions(token, this, this, n2);
             }
 
-
-            /** FIXME */
+            public final void invoke(Parser.Table.Reduction r, Node n, Node n2) {
+                if (n==null) {
+                    if (r.numPop==0) r.reduce(this);
+                    return;
+                }
+                if (r.numPop==0) return;
+                if (n2==null) r.reduce(n);
+                else          r.reduce(n, n2);
+            }
             public void queueEmptyReductions() {
-                if (reducing)
-                    for(Parser.Table.Reduction r : token==null ? state.getEofReductions() : state.getReductions(token))
-                        if (r.numPop==0)
-                            r.reduce(this, null, r.zero());
+                if (!reducing) return;
+                state.invokeReductions(token, this, null, null);
             }
 
-            private Node(Node parent, Forest pending, Parser.Table.State state, Phase start) {
+            private Node(Node parent, Forest pending, Parser.Table.State state) {
                 this.state = state;
+                Phase start = parent==null ? null : parent.phase();
                 if (pending != null) this.holder().merge(pending);
-                if (parent != null) parents().add(parent, true);
+                if (parent != null) parents().add(parent);
                 if (Phase.this.hash.get(code(state, start)) != null) throw new Error("severe problem!");
                 Phase.this.hash.put(code(state, start), this);
                 Phase.this.numNodes++;
@@ -278,6 +245,6 @@ class GSS {
 
     /** this is something of a hack right now */
     private static long code(Parser.Table.State state, Phase start) {
-        return (((long)state.idx) << 32) | (start==null ? 0 : start.pos);
+        return (((long)state.idx) << 32) | (start==null ? 0 : (start.pos+1));
     }
 }