X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FParser.java;h=c5ebd7e3f976abe6aae942895e5bdefdb4ce57e8;hp=4c01e33339ede9670c94187b94ee050bb807968d;hb=acfe58223b9a0f78e64a14a1ca5d5998626ee3fe;hpb=b648ea33534fea67c9926a67b38d2e992c2f5752

diff --git a/src/edu/berkeley/sbp/Parser.java b/src/edu/berkeley/sbp/Parser.java
index 4c01e33..c5ebd7e 100644
--- a/src/edu/berkeley/sbp/Parser.java
+++ b/src/edu/berkeley/sbp/Parser.java
@@ -17,18 +17,32 @@ public abstract class Parser<Tok, Result> {
     /** implement this method to create the output forest corresponding to a lone shifted input token */
     public abstract Forest<Result> shiftToken(Tok t, Input.Location loc);
 
+    public 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(Input<Tok> input) throws IOException, ParseFailed {
         GSS gss = new GSS();
         Input.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);
+        GSS.Phase current = gss.new Phase<Tok>(null, this, null, input.next(), loc, null);
+        current.newNode(null, Forest.leaf(null, null, null), pt.start, true);
         int count = 1;
-        for(;;) {
+        for(int idx=0;;idx++) {
             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,7 +52,27 @@ 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 String toString() {
+            StringBuffer sb = new StringBuffer();
+            sb.append("parse table");
+            for(State<Tok> state : all_states.values()) {
+                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;
 
@@ -111,13 +145,13 @@ public abstract class Parser<Tok, Result> {
 
         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;
@@ -230,6 +264,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+"]: ");