it all works

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

diff --git a/src/edu/berkeley/sbp/Parser.java b/src/edu/berkeley/sbp/Parser.java
index 81b4597..4244d21 100644 (file)
--- a/src/edu/berkeley/sbp/Parser.java
+++ b/src/edu/berkeley/sbp/Parser.java
@@ -37,7 +37,7 @@ public abstract class Parser<T extends Token, R> {
         GSS gss = new GSS();
         Token.Location loc = input.getLocation();
         GSS.Phase current = gss.new Phase(null, input.next(), loc);
-        current.newNode(null, null, pt.start, true, null);
+        current.newNode(null, null, pt.start, true);
         for(;;) {
             loc = input.getLocation();
             GSS.Phase next = gss.new Phase(current, input.next(), loc);
@@ -142,6 +142,10 @@ public abstract class Parser<T extends Token, R> {
                     if (p.element() != null && p.element() instanceof Atom)
                         state.shifts.addAll(state.gotoSetTerminals.subset(((Atom)p.element())));
                 }
+            for(State state : all_states.values()) {
+                state.oreductions = state.reductions.optimize();
+                state.oshifts = state.shifts.optimize();
+            }
         }
 
         /** a single state in the LR table and the transitions possible from it */
@@ -179,15 +183,15 @@ public abstract class Parser<T extends Token, R> {
             private           TopologicalBag<Token,State>     shifts              = new TopologicalBag<Token,State>();
             private           boolean                         accept              = false;
 
-            private VisitableMap<Token,State> oshifts = shifts;
-            //private TopologicalBag<Token,Reduction> reductions2 = reductions;
+            private VisitableMap<Token,State> oshifts = null;
+            private VisitableMap<Token,Reduction> oreductions = null;
 
             // Interface Methods //////////////////////////////////////////////////////////////////////////////
 
             public boolean             isAccepting()               { return accept; }
 
-            public boolean             canShift(Token t)           { return shifts.contains(t); }
-            public boolean             canReduce(Token t)          { return t==null ? eofReductions.size()>0 : reductions.has(t); }
+            public boolean             canShift(Token t)           { return oshifts.contains(t); }
+            public boolean             canReduce(Token t)          { return t==null ? eofReductions.size()>0 : oreductions.contains(t); }
 
             public Iterator<Position>  iterator()                  { return hs.iterator(); }
 
@@ -196,7 +200,7 @@ public abstract class Parser<T extends Token, R> {
             }
             public <B,C> void          invokeReductions(Token t, Invokable<Reduction,B,C> irbc, B b, C c) {
                 if (t==null) for(Reduction r : eofReductions) irbc.invoke(r, b, c);
-                else         reductions.invoke(t, irbc, b, c);
+                else         oreductions.invoke(t, irbc, b, c);
             }
 
             // Constructor //////////////////////////////////////////////////////////////////////////////
@@ -337,6 +341,7 @@ public abstract class Parser<T extends Token, R> {
             public void reduce(GSS.Phase.Node parent, GSS.Phase.Node onlychild) {
                 if (numPop<=0) throw new Error("called wrong form of reduce()");
                 int pos = numPop-1;
+                Forest old = holder[pos];
                 holder[pos] = parent.pending();
                 if (pos==0) {
                     System.arraycopy(holder, 0, position.holder, 0, holder.length);
@@ -344,23 +349,27 @@ public abstract class Parser<T extends Token, R> {
                 } else {
                     reduce(onlychild, pos-1, parent.phase());
                 }
+                holder[pos] = old;
             }
 
             // FIXME: this could be more elegant and/or cleaner and/or somewhere else
             private void reduce(GSS.Phase.Node parent, int pos, GSS.Phase target) {
+                Forest old = holder[pos];
                 holder[pos] = parent.pending();
                 if (pos==0) {
                     System.arraycopy(holder, 0, position.holder, 0, holder.length);
+                    for(int i=0; i<position.pos; i++) if (position.holder[i]==null) throw new Error("realbad");
                     Forest rex = position.rewrite(target.getLocation());
                     for(GSS.Phase.Node child : parent.parents()) finish(child, rex, target);
                 } else {
                     for(GSS.Phase.Node child : parent.parents()) reduce(child, pos-1, target);
                 }
+                holder[pos] = old;
             }
             private void finish(GSS.Phase.Node parent, Forest result, GSS.Phase target) {
                 State state = parent.state.gotoSetNonTerminals.get(position.owner());
                 if (state!=null)
-                    target.newNode(parent, result, state, numPop<=0, parent.phase());
+                    target.newNode(parent, result, state, numPop<=0);
             }
         }
     }