checkpoint

[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 868b200..81b4597 100644 (file)
--- a/src/edu/berkeley/sbp/Parser.java
+++ b/src/edu/berkeley/sbp/Parser.java
@@ -179,15 +179,26 @@ 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;
+
             // Interface Methods //////////////////////////////////////////////////////////////////////////////
 
-            public boolean             canShift(Token t)           { return shifts.contains(t); }
-            public Iterable<State>     getShifts(Token t)          { return shifts.get(t); }
             public boolean             isAccepting()               { return accept; }
-            public Iterable<Reduction> getReductions(Token t)      { return t==null ? eofReductions : reductions.get(t); }
-            public Iterable<Reduction> getEofReductions()          { return eofReductions; }
+
+            public boolean             canShift(Token t)           { return shifts.contains(t); }
+            public boolean             canReduce(Token t)          { return t==null ? eofReductions.size()>0 : reductions.has(t); }
+
             public Iterator<Position>  iterator()                  { return hs.iterator(); }
 
+            public <B,C> void          invokeShifts(Token t, Invokable<State,B,C> irbc, B b, C c) {
+                oshifts.invoke(t, irbc, b, c);
+            }
+            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);
+            }
+
             // Constructor //////////////////////////////////////////////////////////////////////////////
 
             /**