X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FGSS.java;h=65c12e78385d89c64bf3a52d15d2bbbb1223d0af;hp=74cbb484bf568609be666fb79efc2994d345ae11;hb=03dd839af8e8d1a6c2f69c5410da6d19fbbe3931;hpb=b409afa0cf6d72a23703d9172812ab4fcd6a969b

diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java
index 74cbb48..65c12e7 100644
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -5,21 +5,6 @@ import java.io.*;
 import java.util.*;
 import java.lang.reflect.*;
 
-//////////////////////////////////////////////////////////////////////////////
-// TODO:
-//
-//  - fix public/package/private status
-//
-
-//////////////////////////////////////////////////////////////////////////////
-// Optimizations to add
-//
-// ** NOTE: not all of these are appropriate for this class -- it is
-//          simply a list of optimizations not implemented.  This
-//          class is meant to remain simple and easy to understand;
-//          optimizations which obscure that do not belong here (they
-//          should go into the compiled version instead)
-
 /** implements Tomita's Graph Structured Stack */
 class GSS {
 
@@ -81,6 +66,8 @@ class GSS {
         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;
+            if (p.fe && p.phase() != parent.phase()) throw new Error("yep yep");
+            if (!p.fe && p.phase() == parent.phase()) throw new Error("yep yep2");
             p.parents().add(parent, true);
             if (p!=parent && !fromEmptyReduction) p.queueReductions(parent);
         }
@@ -96,7 +83,7 @@ class GSS {
                 //return;
             } while(false);
 
-            Node n = new Node(parent, pending, state);  // ALLOC
+            Node n = new Node(parent, pending, state, fromEmptyReduction);  // ALLOC
             n.queueEmptyReductions();
             if (!fromEmptyReduction) n.queueReductions(parent);
         }
@@ -123,7 +110,7 @@ class GSS {
         }
 
         public void invoke(Parser.Table.State st, Forest result, Node n) {
-            next.newNode(n, result, st, true);
+            next.newNode(n, result, st, false);
         }
         private Phase next = null;
 
@@ -197,6 +184,7 @@ class GSS {
             public  FastSet<Node> parents() { return this; }
 
             public void queueReductions() {
+                if (!reducing) return;
                 if (allqueued) return;
                 allqueued = true;
                 int where = parents().size();
@@ -222,7 +210,9 @@ class GSS {
                 state.invokeReductions(token, this, null, null);
             }
 
-            private Node(Node parent, Forest pending, Parser.Table.State state) {
+            private boolean fe;
+            private Node(Node parent, Forest pending, Parser.Table.State state, boolean fe) {
+                this.fe = fe;
                 this.state = state;
                 Phase start = parent==null ? null : parent.phase();
                 if (pending != null) this.holder().merge(pending);