slow down spinner
[sbp.git] / src / edu / berkeley / sbp / Parser.java
index 130ece9..b4a60b9 100644 (file)
@@ -14,90 +14,68 @@ public abstract class Parser<Token, NodeType> {
 
     /** create a parser to parse the grammar with start symbol <tt>u</tt> */
     public Parser(Union u, Topology<Token> top)  { this.pt = new Table<Token>(u, top); }
-    Parser(Table<Token> pt)               { this.pt = pt; }
 
     /** implement this method to create the output forest corresponding to a lone shifted input token */
     public abstract Forest<NodeType> shiftToken(Token t, Input.Location newloc);
 
-    boolean helpgc = true;
-
     public String toString() { return pt.toString(); }
 
+    private boolean verbose = false;;
+    private static final char[] spin = new char[] { '-', '\\', '|', '/' };
+    private int spinpos = 0;
+    private long last = 0;
+    void spin() {
+        if (verbose) {
+            long now = System.currentTimeMillis();
+            if (now-last < 70) return;
+            last = now;
+            System.err.print("\r  " + spin[spinpos++ % (spin.length)]+ANSI.clreol()+"\r");
+        }
+    }
+
     /** parse <tt>input</tt>, and return the shared packed parse forest (or throw an exception) */
     public Forest<NodeType> parse(Input<Token> input) throws IOException, ParseFailed {
-        GSS gss = new GSS(input);
-        Input.Location loc = input.getLocation();
-        Token tok = input.next();
-        GSS.Phase current = gss.new Phase<Token>(null, null, tok, loc, input.getLocation(), null);
-        current.newNode(new Result(Forest.create(loc.createRegion(loc), null, null, false), null, null), pt.start, true);
-        int count = 1;
-        for(int idx=0;;idx++) {
-            Input.Location oldloc = loc;
-            current.reduce();
-            Forest forest = current.token==null ? null : shiftToken((Token)current.token, loc);
-            loc = input.getLocation();
-            Token nextToken = input.next();
-            GSS.Phase next = gss.new Phase<Token>(current, current, nextToken, loc, input.getLocation(), 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)
-                    ((Node)n).toGraphViz(gv);
-                gv.dump(p);
-                p.flush();
-                p.close();
+        verbose = System.getProperty("sbp.verbose", null) != null;
+        spinpos = 0;
+        try {
+            GSS gss = new GSS(input, this);
+            for(GSS.Phase current = gss.new Phase<Token>(pt.start); ;) {
+                
+                if (verbose) {
+                    String s;
+                    s = "  " + spin[spinpos++ % (spin.length)]+" parsing ";
+                    s += input.getName();
+                    s += " "+input.getLocation();
+                    while(s.indexOf(':') != -1 && s.indexOf(':') < 8) s = " " + s;
+                    String y = "@"+gss.viewPos+" ";
+                    while(y.length() < 9) y = " " + y;
+                    s += y;
+                    //s += "   doom="+Node.doomedNodes;
+                    //while(s.length() < 40) s = s + " ";
+                    s += "   nodes="+gss.numOldNodes;
+                    while(s.length() < 50) s = s + " ";
+                    s += " shifted="+gss.numNewNodes;
+                    while(s.length() < 60) s = s + " ";
+                    s += " reductions="+gss.numReductions;
+                    System.err.print("\r"+s+ANSI.clreol()+"\r");
+                }
+                
+                // FIXME: make sure all the locations line up properly in here
+                if (current.isDone()) return (Forest<NodeType>)current.finalResult;
+                Forest forest = shiftToken((Token)current.token, input.getLocation());
+                current = gss.new Phase<Token>(current, forest);
             }
-            count = next.size();
-            if (current.isDone()) return (Forest<NodeType>)gss.finalResult;
-            current = next;
+        } finally {
+            if (verbose)
+                System.err.print("\r                                                                                \r");
         }
     }
 
+
     // Table //////////////////////////////////////////////////////////////////////////////
 
     /** an SLR(1) parse table which may contain conflicts */
-    static class Table<Token> extends Walk.Cache {
-
-        public String toString() {
-            StringBuffer sb = new StringBuffer();
-            sb.append("parse table");
-            for(State<Token> state : all_states.values()) {
-                sb.append("  " + state + "\n");
-                for(Topology<Token> 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<Token> t : state.reductions)
-                    sb.append("      reduce \""+
-                              new edu.berkeley.sbp.chr.CharTopology((IntegerTopology<Character>)t)+"\" => " +
-                              state.reductions.getAll(t) + "\n");
-                for(Sequence s : state.gotoSetNonTerminals.keySet())
-                    sb.append("      goto   "+state.gotoSetNonTerminals.get(s)+" from " + s + "\n");
-            }
-            return sb.toString();
-        }
-
-        public final Walk.Cache cache = this;
-
-        private void walk(Element e, HashSet<SequenceOrElement> hs) {
-            if (e==null) return;
-            if (hs.contains(e)) return;
-            hs.add(e);
-            if (e instanceof Atom) return;
-            for(Sequence s : (Union)e)
-                walk(s, hs);
-        }
-        private void walk(Sequence s, HashSet<SequenceOrElement> 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);
-        }
+    static class Table<Token> extends Cache {
 
         /** the start state */
         public  final State<Token>   start;
@@ -107,51 +85,49 @@ public abstract class Parser<Token, NodeType> {
 
         /** used to generate unique values for State.idx */
         private int master_state_idx = 0;
-        HashMap<HashSet<Position>,State<Token>>   all_states    = new HashMap<HashSet<Position>,State<Token>>();
-        HashSet<SequenceOrElement>                all_elements  = new HashSet<SequenceOrElement>();
+        HashSet<State<Token>>   all_states    = new HashSet<State<Token>>();
+        HashMap<HashSet<Position>,State<Token>>   doomed_states    = new HashMap<HashSet<Position>,State<Token>>();
+        HashMap<HashSet<Position>,State<Token>>   normal_states    = new HashMap<HashSet<Position>,State<Token>>();
 
         /** construct a parse table for the given grammar */
         public Table(Topology top) { this("s", top); }
         public Table(String startSymbol, Topology top) { this(new Union(startSymbol), top); }
         public Table(Union ux, Topology top) {
+            super(ux, top);
             Union start0 = new Union("0");
-            start0.add(new Sequence.Singleton(ux));
-
-            for(Sequence s : start0) cache.eof.put(s, true);
-            cache.eof.put(start0, true);
+            Sequence seq0 = new Sequence.Singleton(ux);
+            start0.add(seq0);
+            buildFollowSet(seq0, top, true);
 
             // construct the set of states
-            walk(start0, all_elements);
-            for(SequenceOrElement e : all_elements)
-                cache.ys.addAll(e, new Walk.YieldSet(e, cache).walk());
-            for(SequenceOrElement e : all_elements)
-                cache.ys2.addAll(e, new Walk.YieldSet2(e, cache).walk());
             HashSet<Position> hp = new HashSet<Position>();
             reachable(start0, hp);
 
-            this.dead_state = new State<Token>(new HashSet<Position>());
+            this.dead_state = new State<Token>(new HashSet<Position>(), true);
             this.start = new State<Token>(hp);
 
             // for each state, fill in the corresponding "row" of the parse table
-            for(State<Token> state : all_states.values())
+            for(State<Token> state : all_states)
                 for(Position p : state.hs) {
 
                     // the Grammar's designated "last position" is the only accepting state
-                    if (start0.contains(p.owner()) && p.next()==null)
+                    if (start0.contains(p.owner()) && p.next()==null && !state.doomed)
                         state.accept = true;
 
                     if (isRightNullable(p)) {
-                        Walk.Follow wf = new Walk.Follow(top.empty(), p.owner(), all_elements, cache);
-                        Topology follow = wf.walk(p.owner());
+                        Topology<Token> follow = (Topology<Token>)follow(p.owner());
                         for(Position p2 = p; p2 != null && p2.element() != null; p2 = p2.next()) {
-                            Atom set = new Walk.EpsilonFollowSet(new edu.berkeley.sbp.chr.CharAtom(top.empty().complement()),
-                                                                 new edu.berkeley.sbp.chr.CharAtom(top.empty()),
-                                                                 cache).walk(p2.element());
-                            follow = follow.intersect(new Walk.Follow(top.empty(), p2.element(), all_elements, cache).walk(p2.element()));
+                            if (!(p2.element() instanceof Union)) throw new Error("impossible");
+                            Union u = (Union)p2.element();
+                            Atom set = new edu.berkeley.sbp.chr.CharAtom(new edu.berkeley.sbp.chr.CharTopology((Topology<Character>)epsilonFollowSet(u)));
+                            Element p2e = p2.element();
+                            if (p2e instanceof Union)
+                                for(Sequence p2es : ((Union)p2e))
+                                    follow = follow.intersect(follow(p2es));
                             if (set != null) follow = follow.intersect(set.getTokenTopology());
                         }
                         state.reductions.put(follow, p);
-                        if (wf.includesEof()) state.eofReductions.add(p);
+                        if (followEof.contains(p.owner())) state.eofReductions.add(p);
                     }
 
                     // if the element following this position is an atom, copy the corresponding
@@ -159,52 +135,99 @@ public abstract class Parser<Token, NodeType> {
                     if (p.element() != null && p.element() instanceof Atom)
                         state.shifts.addAll(state.gotoSetTerminals.subset(((Atom)p.element()).getTokenTopology()));
                 }
+
             if (top instanceof IntegerTopology)
-                for(State<Token> state : all_states.values()) {
+                for(State<Token> state : all_states) {
                     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 (!possiblyEpsilon(p.element())) return false;
-            return isRightNullable(p.next());
+            // crude algorithm to assing an ordinal ordering to every position
+            // al will be sorted in DECREASING order (al[0] >= al[1])
+            ArrayList<Sequence.Position> al = new ArrayList<Sequence.Position>();
+            for(State s : all_states) {
+                for(Object po : s) {
+                    Sequence.Position p = (Sequence.Position)po;
+                    if (al.contains(p)) continue;
+                    int i=0;
+                    for(; i<al.size(); i++) {
+                        if (comparePositions(p, al.get(i)) < 0)
+                            break;
+                    }
+                    al.add(i, p);
+                }
+            }
+            // FIXME: this actually pollutes the "pure" objects (the ones that should not be modified by the Parser)
+            // sort in increasing order...
+            OUTER: while(true) {
+                for(int i=0; i<al.size(); i++)
+                    for(int j=i+1; j<al.size(); j++)
+                        if (comparePositions(al.get(i), al.get(j)) > 0) {
+                            Sequence.Position p = al.remove(j);
+                            al.add(i, p);
+                            continue OUTER;
+                        }
+                break;
+            }
+
+            int j = 1;
+            int pk = 0;
+            for(int i=0; i<al.size(); i++) {
+                boolean inc = false;
+                for(int k=pk; k<i; k++) {
+                    if (comparePositions(al.get(k), al.get(i)) > 0)
+                        { inc = true; break; }
+                }
+                inc = true;
+                if (inc) {
+                    j++;
+                    pk = i;
+                }
+                al.get(i).ord = j;
+            }
+
+            /*
+            for(int i=0; i<al.size(); i++)
+                if (isRightNullable(al.get(i)))
+                    System.out.println(al.get(i).ord + "   " + al.get(i));
+            */
+            //mastercache = this;
         }
 
         /** a single state in the LR table and the transitions possible from it */
-
         class State<Token> implements IntegerMappable, Iterable<Position> {
         
             public  final     int               idx    = master_state_idx++;
             private final     HashSet<Position> hs;
             public HashSet<State<Token>> also = new HashSet<State<Token>>();
 
-            public transient HashMap<Sequence,State<Token>>         gotoSetNonTerminals = new HashMap<Sequence,State<Token>>();
+            public  transient HashMap<Sequence,State<Token>>         gotoSetNonTerminals = new HashMap<Sequence,State<Token>>();
             private transient TopologicalBag<Token,State<Token>>     gotoSetTerminals    = new TopologicalBag<Token,State<Token>>();
 
-            private           TopologicalBag<Token,Position> reductions          = new TopologicalBag<Token,Position>();
-            private           HashSet<Position>              eofReductions       = new HashSet<Position>();
-            private           TopologicalBag<Token,State<Token>>     shifts              = new TopologicalBag<Token,State<Token>>();
-            private           boolean                         accept              = false;
+            private           TopologicalBag<Token,Position>      reductions          = new TopologicalBag<Token,Position>();
+            private           HashSet<Position>                   eofReductions       = new HashSet<Position>();
+            private           TopologicalBag<Token,State<Token>>  shifts              = new TopologicalBag<Token,State<Token>>();
+            private           boolean                             accept              = false;
 
-            private VisitableMap<Token,State<Token>> oshifts = null;
-            private VisitableMap<Token,Position> oreductions = null;
+            private VisitableMap<Token,State<Token>> oshifts     = null;
+            private VisitableMap<Token,Position>     oreductions = null;
 
             // Interface Methods //////////////////////////////////////////////////////////////////////////////
 
-            boolean             isAccepting()           { return accept; }
-            public Iterator<Position>  iterator()       { return hs.iterator(); }
-
-            boolean             canShift(Token t)         { return oshifts!=null && oshifts.contains(t); }
-            <B,C> void          invokeShifts(Token t, Invokable<State<Token>,B,C> irbc, B b, C c) {
-                oshifts.invoke(t, irbc, b, c);
+            boolean                    isAccepting()           { return accept; }
+            public Iterator<Position>  iterator()              { return hs.iterator(); }
+            boolean                    canShift(Token t)       { return oshifts!=null && oshifts.contains(t); }
+            void                       invokeShifts(Token t, GSS.Phase phase, Result r) { oshifts.invoke(t, phase, r); }
+            boolean                    canReduce(Token t)        {
+                return oreductions != null && (t==null ? eofReductions.size()>0 : oreductions.contains(t)); }
+            void          invokeEpsilonReductions(Token t, Node node) {
+                if (t==null) for(Position r : eofReductions) node.invoke(r, null);
+                else         oreductions.invoke(t, node, null);
             }
-
-            boolean             canReduce(Token t)        { return oreductions != null && (t==null ? eofReductions.size()>0 : oreductions.contains(t)); }
-            <B,C> void          invokeReductions(Token t, Invokable<Position,B,C> irbc, B b, C c) {
-                if (t==null) for(Position r : eofReductions) irbc.invoke(r, b, c);
-                else         oreductions.invoke(t, irbc, b, c);
+            void          invokeReductions(Token t, Node node, Result b) {
+                //System.err.println("\rinvokage:  " + this);
+                if (t==null) for(Position r : eofReductions) node.invoke(r, b);
+                else         oreductions.invoke(t, node, b);
             }
 
             // Constructor //////////////////////////////////////////////////////////////////////////////
@@ -212,7 +235,7 @@ public abstract class Parser<Token, NodeType> {
             /**
              *  create a new state consisting of all the <tt>Position</tt>s in <tt>hs</tt>
              *  @param hs           the set of <tt>Position</tt>s comprising this <tt>State</tt>
-             *  @param all_elements the set of all elements (Atom instances need not be included)
+             *  @param all the set of all elements (Atom instances need not be included)
              *  
              *   In principle these two steps could be merged, but they
              *   are written separately to highlight these two facts:
@@ -231,28 +254,29 @@ public abstract class Parser<Token, NodeType> {
              *  </ul>
              */
             public State(HashSet<Position> hs) { this(hs, false); }
-            public boolean special;
-            public State(HashSet<Position> hs, boolean special) {
+            public boolean doomed;
+            public State(HashSet<Position> hs, boolean doomed) {
                 this.hs = hs;
-                this.special = special;
+                this.doomed = doomed;
 
                 // register ourselves in the all_states hash so that no
                 // two states are ever created with an identical position set
-                ((HashMap)all_states).put(hs, this);
-
+                ((HashMap)(doomed ? doomed_states : normal_states)).put(hs, this);
+                ((HashSet)all_states).add(this);
+                
                 for(Position p : hs) {
                     if (!p.isFirst()) continue;
                     for(Sequence s : p.owner().needs()) {
                         if (hs.contains(s.firstp())) continue;
                         HashSet<Position> h2 = new HashSet<Position>();
-                        reachable(s.firstp(), h2);
-                        also.add((State<Token>)(all_states.get(h2) == null ? (State)new State<Token>(h2,true) : (State)all_states.get(h2)));
+                        reachable(s, h2);
+                        also.add(mkstate(h2, true));
                     }
                     for(Sequence s : p.owner().hates()) {
                         if (hs.contains(s.firstp())) continue;
                         HashSet<Position> h2 = new HashSet<Position>();
                         reachable(s, h2);
-                        also.add((State<Token>)(all_states.get(h2) == null ? (State)new State<Token>(h2,true) : (State)all_states.get(h2)));
+                        also.add(mkstate(h2, true));
                     }
                 }
 
@@ -277,50 +301,46 @@ public abstract class Parser<Token, NodeType> {
                 for(Topology<Token> r : bag0) {
                     HashSet<Position> h = new HashSet<Position>();
                     for(Position p : bag0.getAll(r)) h.add(p);
-                    ((TopologicalBag)gotoSetTerminals).put(r, all_states.get(h) == null
-                                                           ? new State<Token>(h) : all_states.get(h));
+                    ((TopologicalBag)gotoSetTerminals).put(r, mkstate(h, doomed));
                 }
 
-                // Step 2: for every non-Atom element (ie every Element which has a corresponding reduction),
-                //         compute the closure over every position in this set which is followed by a symbol
-                //         which could yield the Element in question.
+                // Step 2: for every Sequence, compute the closure over every position in this set which
+                //         is followed by a symbol which could yield the Sequence.
                 //
                 //         "yields" [in one or more step] is used instead of "produces" [in exactly one step]
                 //         to avoid having to iteratively construct our set of States as shown in most
                 //         expositions of the algorithm (ie "keep doing XYZ until things stop changing").
 
-                HashMapBag<SequenceOrElement,Position> move = new HashMapBag<SequenceOrElement,Position>();
-                for(Position p : hs) {
-                    Element e = p.element();
-                    if (e==null) continue;
-                    for(SequenceOrElement y : cache.ys2.getAll(e)) {
-                        //System.out.println(e + " yields " + y);
-                        HashSet<Position> hp = new HashSet<Position>();
-                        reachable(p.next(), hp);
-                        move.addAll(y, hp);
-                    }
-                }
-                OUTER: for(SequenceOrElement y : move) {
-                    HashSet<Position> h = move.getAll(y);
-                    State<Token> s = all_states.get(h) == null ? (State)new State<Token>(h) : (State)all_states.get(h);
-                    // if a reduction is "lame", it should wind up in the dead_state after reducing
-                    if (y instanceof Sequence) {
-                        for(Position p : hs) {
-                            if (p.element() != null && (p.element() instanceof Union)) {
-                                Union u = (Union)p.element();
-                                for(Sequence seq : u)
-                                    if (seq.needs.contains((Sequence)y) || seq.hates.contains((Sequence)y)) {
-                                        // FIXME: what if there are two "routes" to get to the sequence?
-                                        ((HashMap)gotoSetNonTerminals).put((Sequence)y, dead_state);
-                                        continue OUTER;
-                                    }
-                            }
+                HashMapBag<Sequence,Position> move = new HashMapBag<Sequence,Position>();
+                for(Position p : hs)
+                    if (!p.isLast() && p.element() instanceof Union)
+                        for(Sequence s : ((Union)p.element())) {
+                            HashSet<Position> hp = new HashSet<Position>();
+                            reachable(p.next(), hp);
+                            move.addAll(s, hp);
                         }
-                        gotoSetNonTerminals.put((Sequence)y, s);
-                    }
+                OUTER: for(Sequence y : move) {
+                    // if a reduction is "lame", it should wind up in the dead_state after reducing
+                    HashSet<Position> h = move.getAll(y);
+                    State<Token> s = mkstate(h, doomed);
+                    for(Position p : hs)
+                        if (p.element() != null && (p.element() instanceof Union))
+                            for(Sequence seq : ((Union)p.element()))
+                                if (seq.needs.contains(y) || seq.hates.contains(y)) {
+                                    // FIXME: assumption that no sequence is ever both usefully (non-lamely) matched
+                                    //        and also directly lamely matched
+                                    ((HashMap)gotoSetNonTerminals).put(y, dead_state);
+                                    continue OUTER;
+                                }
+                    gotoSetNonTerminals.put(y, s);
                 }
             }
 
+            private State<Token> mkstate(HashSet<Position> h, boolean b) {
+                if (b) return doomed_states.get(h) == null ? (State)new State<Token>(h,b) : (State)doomed_states.get(h);
+                else   return normal_states.get(h) == null ? (State)new State<Token>(h,b) : (State)normal_states.get(h);
+            }
+
             public String toStringx() {
                 StringBuffer st = new StringBuffer();
                 for(Position p : this) {
@@ -329,6 +349,7 @@ public abstract class Parser<Token, NodeType> {
                 }
                 return st.toString();
             }
+
             public String toString() {
                 StringBuffer ret = new StringBuffer();
                 ret.append("state["+idx+"]: ");
@@ -336,9 +357,30 @@ public abstract class Parser<Token, NodeType> {
                 return ret.toString();
             }
 
-            public Walk.Cache cache() { return cache; }
             public int toInt() { return idx; }
         }
+
+        public String toString() {
+            StringBuffer sb = new StringBuffer();
+            sb.append("parse table");
+            for(State<Token> state : all_states) {
+                sb.append("  " + state + "\n");
+                for(Topology<Token> 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<Token> t : state.reductions)
+                    sb.append("      reduce \""+
+                              new edu.berkeley.sbp.chr.CharTopology((IntegerTopology<Character>)t)+"\" => " +
+                              state.reductions.getAll(t) + "\n");
+                for(Sequence s : state.gotoSetNonTerminals.keySet())
+                    sb.append("      goto   "+state.gotoSetNonTerminals.get(s)+" from " + s + "\n");
+            }
+            return sb.toString();
+        }
     }
 
     // Helpers //////////////////////////////////////////////////////////////////////////////
@@ -358,5 +400,5 @@ public abstract class Parser<Token, NodeType> {
         h.add(p);
         if (p.element() != null) reachable(p.element(), h);
     }
-
+    //public static Cache mastercache = null;
 }