checkpoint

[sbp.git] / src / edu / berkeley / sbp / GSS.java

diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java
index f85ec0b..816c086 100644 (file)
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -8,17 +8,17 @@ import java.util.*;
 import java.lang.reflect.*;
 
 /** implements Tomita's Graph Structured Stack */
-public class GSS {
+class GSS {
 
-    public static int count = 0;
-    public static int shifts = 0;
-    public static int reductions = 0;
+    static int count = 0;
+    static int shifts = 0;
+    static int reductions = 0;
+    int resets = 0;
+    int waits = 0;
     
     public GSS() { }
 
     private Phase.Node[] reducing_list = null;
-    public int resets = 0;
-    public int waits = 0;
 
     // FIXME: right now, these are the performance bottleneck
     HashMapBag<Sequence,Phase.Waiting> waiting         = new HashMapBag<Sequence,Phase.Waiting>();
@@ -27,7 +27,7 @@ public class GSS {
     HashMapBag<Integer,Sequence>       expected        = new HashMapBag<Integer,Sequence>();
     
     /** FIXME */
-    public  Forest.Many finalResult;
+    Forest.Many finalResult;
 
     /** corresponds to a positions <i>between tokens</i> the input stream; same as Tomita's U_i's */
     class Phase<Tok> implements Invokable<State, Forest, Phase<Tok>.Node>, IntegerMappable, GraphViz.ToGraphViz, Iterable<Phase.Node> {
@@ -133,8 +133,7 @@ public class GSS {
                             }
                 }
             }
-            if (!owner.lame)
-                newNode(parent, pending, state, fromEmptyReduction);
+            newNode(parent, pending, state, fromEmptyReduction);
             if (reduction != null) {
                 boolean redo = true;
                 while(redo) {
@@ -344,7 +343,7 @@ public class GSS {
                     for(Node child : ((Forest.Many<?>)result).parents) {
                         if (only != null && child!=only) continue;
                         holder[pos] = result;
-                        if (pos==0) child.finish(r, r.rewrite(new Input.Region(child.phase().getLocation(), phase().getLocation())), target);
+                        if (pos==0) child.finish(r, r.rewrite(child.phase().getLocation().createRegion(phase().getLocation())), target);
                         else        child.reduce(r, pos-1, target, null);
                     }