X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FParser.java;h=0c9ed84001b6450dcf91defba171095e969e08da;hp=75f3ace8064784f45d3186eb6a99b21317aeb1a9;hb=5d18f5606c9296e6b0c5749f05fc68f358ace2f6;hpb=a7b84506c2e1ed63343db215f76afced082e2826

diff --git a/src/edu/berkeley/sbp/Parser.java b/src/edu/berkeley/sbp/Parser.java
index 75f3ace..0c9ed84 100644
--- a/src/edu/berkeley/sbp/Parser.java
+++ b/src/edu/berkeley/sbp/Parser.java
@@ -42,13 +42,6 @@ public abstract class Parser<Tok, Result> {
 
         public final Walk.Cache cache = this;
 
-        public void optimize(Functor<Tok,Integer> f) {
-            for(State<Tok> state : all_states.values()) {
-                state.oreductions = state.reductions.optimize(f);
-                state.oshifts = state.shifts.optimize(f);
-            }
-        }
-
         private void walk(Element e, HashSet<Element> hs) {
             if (e==null) return;
             if (hs.contains(e)) return;
@@ -73,7 +66,7 @@ public abstract class Parser<Tok, Result> {
         public Table(String startSymbol, Topology top) { this(new Union(startSymbol), top); }
         public Table(Union ux, Topology top) {
             Union start0 = new Union("0");
-            start0.add(new Sequence.Singleton(ux, null, null));
+            start0.add(new Sequence.Singleton(ux));
 
             for(Sequence s : start0) cache.eof.put(s, true);
             cache.eof.put(start0, true);
@@ -109,11 +102,16 @@ public abstract class Parser<Tok, Result> {
                     if (p.element() != null && p.element() instanceof Atom)
                         state.shifts.addAll(state.gotoSetTerminals.subset(((Atom)p.element())));
                 }
+            if (top instanceof IntegerTopology)
+                for(State<Tok> state : all_states.values()) {
+                    state.oreductions = state.reductions.optimize(((IntegerTopology)top).functor());
+                    state.oshifts = state.shifts.optimize(((IntegerTopology)top).functor());
+                }
         }
 
         private boolean isRightNullable(Position p) {
             if (p.isLast()) return true;
-            if (!p.element().possiblyEpsilon(this)) return false;
+            if (!possiblyEpsilon(p.element())) return false;
             return isRightNullable(p.next());
         }