X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fedu%2Fberkeley%2Fsbp%2FGSS.java;h=5ede971081945b877165a3a7945a5889cc82fee2;hb=2cca97362e80d5a3cd3e02d791a10cd7c6f6b29c;hp=7af8b0754fe25e7fe38d388431a5b0cf47a5e02c;hpb=acfe58223b9a0f78e64a14a1ca5d5998626ee3fe;p=sbp.git

diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java
index 7af8b07..5ede971 100644
--- 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.Ref 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> {
@@ -50,17 +50,19 @@ public class GSS {
         private Phase next = null;
         private Phase prev;
         private Input.Location location;
+        private Input.Location nextLocation;
         public final Parser parser;
 
         private Forest forest;
 
-        public Phase(Phase prev, Parser parser, Phase previous, Tok token, Input.Location location, Forest forest) throws ParseFailed {
+        public Phase(Phase prev, Parser parser, Phase previous, Tok token, Input.Location location, Input.Location nextLocation, Forest forest) throws ParseFailed {
             this.prev = prev;
             this.forest = forest;
             this.parser = parser;
             this.pos = previous==null ? 0 : previous.pos+1;
             this.token = token;
             this.location = location;
+            this.nextLocation = nextLocation;
             performed.clear();
             reset();
         }
@@ -89,6 +91,7 @@ public class GSS {
         }
 
         public Input.Location getLocation() { return location; }
+        public Input.Location getNextLocation() { return nextLocation; }
 
         /** add a new node (merging with existing nodes if possible)
          *  @param parent             the parent of the new node
@@ -133,8 +136,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) {
@@ -230,7 +232,7 @@ public class GSS {
             boolean ok = false;
             for(Phase.Node n : hash.values()) {
                 if (token == null && n.state.isAccepting()) {
-                    if (finalResult==null) finalResult = new Forest.Ref();
+                    if (finalResult==null) finalResult = new Forest.Many();
                     for(Object f : n.results())
                         finalResult.merge((Forest)f);
                 }
@@ -285,18 +287,18 @@ public class GSS {
             /** which Phase this Node belongs to (node that Node is also a non-static inner class of Phase) */
             public  Phase phase() { return Phase.this; }
 
-            private HashSet<Forest.Ref> resultMap = new HashSet<Forest.Ref>();
-            public Iterable<Forest.Ref> results() { return resultMap; }
+            private HashSet<Forest.Many> resultMap = new HashSet<Forest.Many>();
+            public Iterable<Forest.Many> results() { return resultMap; }
             public FastSet<Node> parents() { return set; }
             public boolean merge(Node parent, Forest result) {
                 // FIXME: inefficient!
-                for(Forest.Ref f : results()) {
+                for(Forest.Many f : results()) {
                     if (f.parents.contains(parent) /* UGLY: */ && f.parents.size()==1) {
                         f.merge(result);
                         return true;
                     }
                 }
-                Forest.Ref f = new Forest.Ref();
+                Forest.Many f = new Forest.Many();
                 f.parents.add(parent);
                 f.merge(result);
                 resultMap.add(f);
@@ -338,11 +340,13 @@ public class GSS {
                 Forest[] holder = r.holder;
                 Forest old = holder[pos];
 
-                for(Forest result : results())
-                    for(Node child : ((Forest.Ref<?>)result).parents) {
+                HashSet<Forest> rr = new HashSet<Forest>();
+                for(Forest result : results()) rr.add(result);
+                for(Forest result : rr)
+                    for(Node child : ((Forest.Many<?>)result).parents) {
                         if (only != null && child!=only) continue;
                         holder[pos] = result;
-                        if (pos==0) child.finish(r, r.rewrite(phase().getLocation()), target);
+                        if (pos==0) child.finish(r, r.rewrite(child.phase().getNextLocation().createRegion(target.getLocation())), target);
                         else        child.reduce(r, pos-1, target, null);
                     }