checkpoint
[sbp.git] / src / edu / berkeley / sbp / Parser.java
index 60da9e4..d4d5415 100644 (file)
@@ -15,20 +15,35 @@ public abstract class Parser<Tok, Result> {
     protected Parser(Table<Tok> pt)               { this.pt = pt; }
 
     /** implement this method to create the output forest corresponding to a lone shifted input token */
-    public abstract Forest<Result> shiftToken(Tok t, Token.Location loc);
+    protected abstract Forest<Result> shiftToken(Tok t, Input.Location newloc);
+
+    boolean helpgc = true;
+
+    public String toString() { return pt.toString(); }
 
     /** parse <tt>input</tt>, using the table <tt>pt</tt> to drive the parser */
-    public Forest<Result> parse(Token.Stream<Tok> input) throws IOException, ParseFailed {
+    public Forest<Result> parse(Input<Tok> input) throws IOException, ParseFailed {
         GSS gss = new GSS();
-        Token.Location loc = input.getLocation();
-        GSS.Phase current = gss.new Phase<Tok>(null, this, null, input.next(1, 0, 0), loc, null);
-        current.newNode(null, Forest.leaf(null, null), pt.start, true);
+        Input.Location loc = input.getLocation();
+        GSS.Phase current = gss.new Phase<Tok>(null, this, null, input.next(), loc, null);
+        current.newNode(null, Forest.create(null, null, null, false), pt.start, true);
         int count = 1;
-        for(;;) {
+        for(int idx=0;;idx++) {
+            Input.Location oldloc = loc;
             loc = input.getLocation();
             current.reduce();
             Forest forest = current.token==null ? null : shiftToken((Tok)current.token, loc);
-            GSS.Phase next = gss.new Phase<Tok>(current, this, current, input.next(count, gss.resets, gss.waits), loc, forest);
+            GSS.Phase next = gss.new Phase<Tok>(current, this, current, input.next(), loc, forest);
+            if (!helpgc) {
+                FileOutputStream fos = new FileOutputStream("out-"+idx+".dot");
+                PrintWriter p = new PrintWriter(new OutputStreamWriter(fos));
+                GraphViz gv = new GraphViz();
+                for(Object n : next)
+                    ((GSS.Phase.Node)n).toGraphViz(gv);
+                gv.dump(p);
+                p.flush();
+                p.close();
+            }
             count = next.size();
             if (current.isDone()) return (Forest<Result>)gss.finalResult;
             current = next;
@@ -38,27 +53,44 @@ public abstract class Parser<Tok, Result> {
     // Table //////////////////////////////////////////////////////////////////////////////
 
     /** an SLR(1) parse table which may contain conflicts */
-    public static class Table<Tok> extends Walk.Cache {
+    static class Table<Tok> extends Walk.Cache {
 
-        public final Walk.Cache cache = this;
-
-        public void optimize(Functor<Tok,Integer> f) {
+        public String toString() {
+            StringBuffer sb = new StringBuffer();
+            sb.append("parse table");
             for(State<Tok> state : all_states.values()) {
-                state.oreductions = state.reductions.optimize(f);
-                state.oshifts = state.shifts.optimize(f);
+                sb.append("  " + state + "\n");
+                for(Topology<Tok> t : state.shifts) {
+                    sb.append("      shift  \""+
+                              new edu.berkeley.sbp.chr.CharTopology((IntegerTopology<Character>)t)+"\" => ");
+                    for(State st : state.shifts.getAll(t))
+                        sb.append(st.idx+"  ");
+                    sb.append("\n");
+                }
+                for(Topology<Tok> t : state.reductions)
+                    sb.append("      reduce \""+
+                              new edu.berkeley.sbp.chr.CharTopology((IntegerTopology<Character>)t)+"\" => " +
+                              state.reductions.getAll(t) + "\n");
             }
+            return sb.toString();
         }
 
+        public final Walk.Cache cache = this;
+
         private void walk(Element e, HashSet<Element> hs) {
             if (e==null) return;
             if (hs.contains(e)) return;
             hs.add(e);
             if (e instanceof Atom) return;
-            for(Sequence s : (Union)e) {
-                hs.add(s);
-                for(Position p = s.firstp(); p != null; p = p.next())
-                    walk(p.element(), hs);
-            }
+            for(Sequence s : (Union)e)
+                walk(s, hs);
+        }
+        private void walk(Sequence s, HashSet<Element> hs) {
+            hs.add(s);
+            for(Position p = s.firstp(); p != null; p = p.next())
+                walk(p.element(), hs);
+            for(Sequence ss : s.needs()) walk(ss, hs);
+            for(Sequence ss : s.hates()) walk(ss, hs);
         }
 
         /** the start state */
@@ -73,7 +105,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,17 +141,22 @@ 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());
         }
 
         /** a single state in the LR table and the transitions possible from it */
 
-        public class State<Tok> implements Comparable<State<Tok>>, IntegerMappable, Iterable<Position> {
+        class State<Tok> implements Comparable<State<Tok>>, IntegerMappable, Iterable<Position> {
         
             public  final     int               idx    = master_state_idx++;
             private final     HashSet<Position> hs;
@@ -232,6 +269,14 @@ public abstract class Parser<Tok, Result> {
                 }
             }
 
+            public String toStringx() {
+                StringBuffer st = new StringBuffer();
+                for(Position p : this) {
+                    if (st.length() > 0) st.append("\n");
+                    st.append(p);
+                }
+                return st.toString();
+            }
             public String toString() {
                 StringBuffer ret = new StringBuffer();
                 ret.append("state["+idx+"]: ");
@@ -246,10 +291,15 @@ public abstract class Parser<Tok, Result> {
 
     // Helpers //////////////////////////////////////////////////////////////////////////////
     
+    private static void reachable(Sequence s, HashSet<Position> h) {
+        reachable(s.firstp(), h);
+        for(Sequence ss : s.needs()) reachable(ss, h);
+        for(Sequence ss : s.hates()) reachable(ss, h);
+    }
     private static void reachable(Element e, HashSet<Position> h) {
         if (e instanceof Atom) return;
         for(Sequence s : ((Union)e))
-            reachable(s.firstp(), h);
+            reachable(s, h);
     }
     private static void reachable(Position p, HashSet<Position> h) {
         if (h.contains(p)) return;