checkpoint
[sbp.git] / src / edu / berkeley / sbp / GSS.java
index 404dee9..89a16ed 100644 (file)
@@ -1,9 +1,8 @@
 package edu.berkeley.sbp;
 import edu.berkeley.sbp.*;
 import edu.berkeley.sbp.util.*;
+import edu.berkeley.sbp.Parser.Table.*;
 import edu.berkeley.sbp.Sequence.Position;
-import edu.berkeley.sbp.Parser.Table.State;
-import edu.berkeley.sbp.Parser.Table.Reduction;
 import java.io.*;
 import java.util.*;
 import java.lang.reflect.*;
@@ -17,41 +16,39 @@ class GSS {
     public int resets = 0;
     public int waits = 0;
 
-    HashMapBag<Integer,Sequence> inhibited = new HashMapBag<Integer,Sequence>();
-    HashMapBag<Sequence,Phase.Waiting> waiting   = new HashMapBag<Sequence,Phase.Waiting>();
-    HashMapBag<Integer,Sequence> performed = new HashMapBag<Integer,Sequence>();
+    HashMapBag<Integer,Sequence>       inhibited       = new HashMapBag<Integer,Sequence>();
+    HashMapBag<Integer,Sequence>       expectedInhibit = new HashMapBag<Integer,Sequence>();
+    HashMapBag<Sequence,Phase.Waiting> waiting         = new HashMapBag<Sequence,Phase.Waiting>();
+    HashMapBag<Integer,Sequence>       performed       = new HashMapBag<Integer,Sequence>();
     
+    /** FIXME */
+    public  Forest.Ref finalResult;
+
     /** corresponds to a positions <i>between tokens</i> the input stream; same as Tomita's U_i's */
-    public class Phase implements Invokable<State, Forest, GSS.Phase.Node> {
+    public class Phase<Tok> implements Invokable<State, Forest, Phase<Tok>.Node>, IntegerMappable {
 
-        /** the token immediately after this phase */
-        public  final Token token;
+        public void invoke(State st, Forest result, Node n) {
+            good |= next.newNode(n, result, st, false);
+        }
 
-        boolean reducing;
+        /** the token immediately after this phase */
+        final Tok token;
 
-        /** currently this is necessary only for the code() hack -- it doesn't actually correspond to the input */
         private final int pos;
 
-        /** FIXME */
-        public  Forest.Ref finalResult;
-
-        /** all nodes, keyed by the value returned by code() */
-        /*private*/ HashMap<Long,Phase.Node> hash;  /* ALLOC */
-
-        /** the number of nodes in this phase */
-        private int numNodes;
-
-        boolean closed;
-
+        boolean reducing;
+        private IntPairMap<Phase.Node> hash;  /* ALLOC */
+        private IntPairMap<Forest> singularReductions;  /* ALLOC */
+        private boolean closed;
         private boolean good;
         private Phase next = null;
-
-        private Token.Location location;
+        private Phase prev;
+        private Input.Location location;
         public final Parser parser;
 
         private Forest forest;
-        Phase prev;
-        public Phase(Phase prev, Parser parser, Phase previous, Token token, Token.Location location, Forest forest) {
+
+        public Phase(Phase prev, Parser parser, Phase previous, Tok token, Input.Location location, Forest forest) {
             this.prev = prev;
             this.forest = forest;
             this.parser = parser;
@@ -65,96 +62,26 @@ class GSS {
         public void reset() {
             waiting.clear();
             performed.clear();
-            hash = new HashMap<Long,Phase.Node>();
+            hash = new IntPairMap<Phase.Node>();
+            singularReductions = new IntPairMap<Forest>();
+            expectedInhibit.clear();
+            expectedInhibit.addAll(inhibited);
             good = false;
             closed = false;
-            numNodes = 0;
             reducing = false;
             finalResult = null;
             if (prev != null) prev.shift(this, forest);
         }
 
-        public void complain(Node n, HashMap<String,HashSet<String>> errors, boolean force) {
-            if (n.touched) return;
-            n.touched = true;
-            for(Position p : n.state) {
-                //if (!p.isLast()) { 
-                if (((p.isFirst() || p.isLast()) && !force) || p.owner().name==null) {
-                    for(Node n2 : n.parents())
-                        complain(n2, errors, force | p.isFirst());
-                } else {
-                    String seqname = p.owner().name;
-                    HashSet<String> hs = errors.get(seqname);
-                    if (hs==null) errors.put(seqname, hs = new HashSet<String>());
-                    hs.add(p.element()+"");
-                    //String s = "  while parsing " + seqname + ": expected a " + p.element();
-                        //"\n";
-                    /*
-                    s +=       "      parsed: ";
-                    for(Position p2 = p.owner().firstp(); p2 != null && p2 != p && !p2.isLast(); p2 = p2.next()) s += (p2.element() + " ");
-                    s += "\n";
-                    s +=       "    expected: ";
-                    for(Position p2 = p; p2 != null && !p2.isLast(); p2 = p2.next()) s += (p2.element() + " ");
-                    */
-                    //s += "\n";
-                    //errors.add(s);
-                }
-            }
-        }
-
-        public String black(Object o) { return "\033[30m"+o+"\033[0m"; }
-        public String red(Object o) { return "\033[31m"+o+"\033[0m"; }
-        public String green(Object o) { return "\033[32m"+o+"\033[0m"; }
-        public String yellow(Object o) { return "\033[33m"+o+"\033[0m"; }
-        public String blue(Object o) { return "\033[34m"+o+"\033[0m"; }
-        public String purple(Object o) { return "\033[35m"+o+"\033[0m"; }
-        public String cyan(Object o) { return "\033[36m"+o+"\033[0m"; }
-        public String el(Object e) {
-            String s = e.toString();
-            if (s.length()==0 || s.charAt(0)!='\"' || s.charAt(s.length()-1)!='\"') return yellow(s);
-            s = s.substring(1);
-            s = s.substring(0, s.length()-1);
-            StringBuffer ret = new StringBuffer();
-            for(int i=0; i<s.length(); i++) {
-                if (s.charAt(i)=='\\' && i<s.length()-1) ret.append(s.charAt(++i));
-                else ret.append(s);
-            }
-            return purple(ret.toString());
-        }
-        public String error(String message) {
-            String lookAhead = token==null ? "<EOF>" : token.toString();
-            StringBuffer ret = new StringBuffer();
-            ret.append("\n  ");
-            ret.append(message);
-            HashMap<String,HashSet<String>> errors = new HashMap<String,HashSet<String>>();
-            for(Node n : hash.values()) complain(n, errors, false);
-            for(String s : errors.keySet()) {
-                ret.append("    while parsing " + yellow(s));
-                HashSet<String> hs = errors.get(s);
-                if (hs.size()==1) ret.append(" expected " + yellow(el(hs.iterator().next())) + "\n");
-                else {
-                    ret.append(" expected ");
-                    boolean first = true;
-                    for(String s2 : hs) {
-                        if (!first) ret.append(" or ");
-                        first = false;
-                        ret.append(yellow(el(s2)));
-                    }
-                    ret.append("\n");
-                }
-            }
-            return ret.toString();
-        }
-        
-        public boolean isDone() throws Parser.Failed {
+      
+        public boolean isDone() throws ParseFailed {
             if (token != null) return false;
             if (token==null && finalResult==null)
-                throw new Parser.Failed(error(red("unexpected end of file\n")),
-                                        getLocation());
+                throw new ParseFailed(ParseFailed.error(ANSI.red("unexpected end of file\n"), token, hash.values()), getLocation());
             return true;
         }
 
-        public Token.Location getLocation() { return location; }
+        public Input.Location getLocation() { return location; }
 
         /** add a new node (merging with existing nodes if possible)
          *  @param parent             the parent of the new node
@@ -164,33 +91,36 @@ class GSS {
          *  @param start              the earliest part of the input contributing to this node (used to make merging decisions)
          */
         public boolean newNode(Node parent, Forest pending, State state, boolean fromEmptyReduction) {
-            return newNode(parent, pending, state, fromEmptyReduction, null); }
-        public boolean newNode(Node parent, Forest pending, State state, boolean fromEmptyReduction, Reduction reduction) {
+            Node p = hash.get(state, parent==null?null:parent.phase());
+            if (p != null)  return newNode2(p, parent, pending, state, fromEmptyReduction);
+            else            return newNode3(parent, pending, state, fromEmptyReduction);
+        }
+        public void newNode(Node parent, Forest pending, State state, boolean fromEmptyReduction, Position reduction) {
             int pos = parent==null?0:parent.phase()==null?0:parent.phase().pos;
+            Sequence owner = reduction==null ? null : reduction.owner();
             if (reduction!=null) {
-                if (inhibited.contains(pos, reduction.position.owner())) return false;
-                if (reduction.position.owner().needs != null) {
-                    for(Sequence s : reduction.position.owner().needs) {
+                if (inhibited.contains(pos, owner)) return;
+                if (owner.needs != null)
+                    for(Sequence s : owner.needs)
                         if (!performed.contains(pos, s)) {
                             waiting.add(s, new Waiting(parent, pending, state, fromEmptyReduction, reduction));
-                            return false;
+                            return;
                         }
-                    }
-                }
-                performed.add(pos, reduction.position.owner());
+                if ((owner.needed != null && owner.needed.size()>0) ||
+                    (owner.hated != null && owner.hated.size()>0) ||
+                    (owner.hates != null && owner.hates.size()>0))
+                    performed.add(pos, owner);
             }
-            Node p = hash.get(code(state, parent==null?null:parent.phase()));
-            boolean ret;
+            if (!owner.lame)
+                newNode(parent, pending, state, fromEmptyReduction);
             if (reduction!=null) inhibit(reduction, parent==null?0:parent.phase().pos);
-            if (p != null)  ret = newNode2(p, parent, pending, state, fromEmptyReduction, reduction);
-            else            ret = newNode3(parent, pending, state, fromEmptyReduction, reduction);
             if (reduction != null) {
                 boolean redo = true;
                 while(redo) {
                     redo = false;
-                    for(Waiting w : waiting.getAll(reduction.position.owner())) {
+                    for(Waiting w : waiting.getAll(owner)) {
                         if (w.parent==parent || (parent!=null&&w.parent!=null&&w.parent.phase()==parent.phase())) {
-                            waiting.remove(reduction.position.owner(), w);
+                            waiting.remove(owner, w);
                             w.perform();
                             redo = true;
                             break;
@@ -198,46 +128,57 @@ class GSS {
                     }
                 }
             }
-            return ret;
         }
-        private boolean newNode2(Node p, Node parent, Forest pending, State state, boolean fromEmptyReduction, Reduction reduction) {
+        private boolean newNode2(Node p, Node parent, Forest pending, State state, boolean fromEmptyReduction) {
             p.holder.merge(pending);
             if (p.parents().contains(parent)) return true;
-            //if (p.fe && p.phase() != parent.phase()) throw new Error("yep yep");
-            //if (!p.fe && p.phase() == parent.phase()) throw new Error("yep yep2");
             p.parents().add(parent, true);
-            if (p!=parent && !fromEmptyReduction) p.queueReductions(parent);
+            if (p!=parent && !fromEmptyReduction && reducing) p.performReductions(parent);
             return true;
         }
-        private boolean newNode3(Node parent, Forest pending, State state, boolean fromEmptyReduction, Reduction reduction) {
+        private boolean newNode3(Node parent, Forest pending, State state, boolean fromEmptyReduction) {
             do {
                 if (token != null && state.canShift(token)) break;
                 if (state.isAccepting()) break;
                 if (token==null) break;
-                //if (!state.canReduce(token)) return false;
+                if (!state.canReduce(token)) return false;
                 //if (count > 1) break;
                 //if (r.numPop == 0) break;
                 //r.reduce(pending, parent, null, Phase.this, null);
                 //return;
             } while(false);
 
-            Node n = new Node(parent, pending, state, fromEmptyReduction);  // ALLOC
-            n.queueEmptyReductions();
-            if (!fromEmptyReduction) n.queueReductions(parent);
+            Node n = new Node(parent, pending, state);  // ALLOC
+            if (reducing) {
+                n.performEmptyReductions();
+                if (!fromEmptyReduction) n.performReductions(parent);
+            }
             return true;
         }
 
-        public void inhibit(Reduction r, int p) {
-            if (r.position.owner().hated == null) return;
+        public void uninhibit(int p, Sequence s) {
+            if (s.hated!=null)
+                for(Sequence s2 : s.hated)
+                    inhibited.remove(p, s2);
+        }
+
+        public void inhibit(Position r, int p) {
+            if (r.owner().hated == null) return;
             // remember that dead states are still allowed to shift -- just not allowed to reduce
-            for(Sequence seq : r.position.owner().hated) {
+            boolean reset = false;
+            for(Sequence seq : r.owner().hated) {
                 if (performed.contains(p,seq)) {
-                    inhibited.clear();
+                    uninhibit(p, seq);
+                    //System.out.println("\nresetting due to " + r.owner() + " killing " + seq);
+                    //inhibited.clear();
                     inhibited.add(p, seq);
+                    //inhibited = new HashMapBag<Integer,Sequence>();
+                    reset = true;
                     resets++;
                     throw new Reset();
                 }
                 inhibited.add(p, seq);
+                expectedInhibit.remove(p, seq);
             }
         }
         
@@ -247,18 +188,22 @@ class GSS {
                 reducing = true;
                 if (reducing_list==null || reducing_list.length < hash.size())
                     reducing_list = new Phase.Node[hash.size() * 4];
-                Collection<Node> hv = hash.values();
-                hv.toArray(reducing_list);
-                int num = hv.size();
+                hash.toArray(reducing_list);
+                int num = hash.size();
                 for(int i=0; i<num; i++) {
                     Node n = reducing_list[i];
-                    n.queueEmptyReductions();
+                    n.performEmptyReductions();
                     // INVARIANT: we never "see" a node until its parent-set is complete, modulo merges
                 }
                 for(int i=0; i<num; i++) {
                     Node n = reducing_list[i];
                     reducing_list[i] = null;
-                    n.queueReductions();
+                    n.performReductions();
+                }
+                if (expectedInhibit.size() > 0) {
+                    inhibited.removeAll(expectedInhibit);
+                    System.out.println("\n!!!!\n");
+                    throw new Reset();
                 }
             } catch (Reset r) {
                 reset();
@@ -268,38 +213,35 @@ class GSS {
 
         class Reset extends RuntimeException { }
 
-        public void invoke(State st, Forest result, Node n) {
-            good |= next.newNode(n, result, st, false);
-        }
-
         /** perform all shift operations, adding promoted nodes to <tt>next</tt> */
-        public void shift(Phase next, Forest result) throws Parser.Failed {
-            if (prev!=null) prev.hash = null;
+        public void shift(Phase next, Forest result) throws ParseFailed {
+            // this massively improves GC performance
+            if (prev!=null) {
+                prev.hash = null;
+                prev.singularReductions = null;
+            }
             this.next = next;
             closed = true;
             Forest res = null;
             boolean ok = false;
             for(Phase.Node n : hash.values()) {
-                if (n.holder==null) continue;
-                n.holder.resolve();
                 if (token == null && n.state.isAccepting()) {
                     if (finalResult==null) finalResult = new Forest.Ref();
                     finalResult.merge(n.holder);
                 }
-                if (!n.holder.valid()) continue;
                 if (token == null) continue;
                 n.state.invokeShifts(token, this, result, n);
             }
 
             if (!good && token!=null)
-                throw new Parser.Failed(error(red("unexpected character")+" "+purple(token)+" encountered at "+green(getLocation())+"\n"),
+                throw new ParseFailed(ParseFailed.error(ANSI.red("unexpected character ")+" \'"+
+                                                        ANSI.purple(StringUtil.escapify(token+"", "\\\'\r\n"))+
+                                                        "\' encountered at "+
+                                                        ANSI.green(getLocation())+"\n", token, hash.values()),
                                         getLocation());
             if (token==null && finalResult==null)
-                throw new Parser.Failed(error(red("unexpected end of file\n")),
+                throw new ParseFailed(ParseFailed.error(ANSI.red("unexpected end of file\n"), token, hash.values()),
                                         getLocation());
-
-            // this massively improves GC performance
-            //hash = null;
         }
 
 
@@ -308,8 +250,8 @@ class GSS {
             Forest pending;
             State state;
             boolean fromEmptyReduction;
-            Reduction reduction;
-            public Waiting(Node parent, Forest pending, State state, boolean fromEmptyReduction, Reduction reduction) {
+            Position reduction;
+            public Waiting(Node parent, Forest pending, State state, boolean fromEmptyReduction, Position reduction) {
                 waits++;
                 this.parent = parent;
                 this.pending = pending;
@@ -318,91 +260,113 @@ class GSS {
                 this.reduction = reduction;
             }
             public void perform() {
-                System.out.println("performing: " + reduction.position);
+                //System.out.println("performing: " + reduction.position);
                 newNode(parent, pending, state, fromEmptyReduction, reduction);
             }
         }
        
-        // GSS Nodes //////////////////////////////////////////////////////////////////////////////
+        // Node /////////////////////////////////////////////////////////////////////////////////
 
         /** a node in the GSS */
-        public final class Node extends FastSet<Node> implements Invokable<Reduction, Node, Node> {
+        public final class Node extends FastSet<Node> implements Invokable<Position, Node, Node>, IntegerMappable {
 
-            public boolean touched = false;
             private Forest.Ref holder = null;
             private boolean allqueued = false;
 
             /** what state this node is in */
-            public final State state;
+            public final Parser.Table<Tok>.State<Tok> state;
 
             /** which Phase this Node belongs to (node that Node is also a non-static inner class of Phase) */
-            public Phase phase() { return Phase.this; }
-
+            public  Phase phase() { return Phase.this; }
             public  Forest.Ref holder() { return holder==null ? (holder = new Forest.Ref()) : holder; }
             public  Forest pending() { return Phase.this.closed ? holder().resolve() : holder; }
             public  FastSet<Node> parents() { return this; }
 
-            public void queueReductions() {
-                if (!reducing) return;
+            public void performReductions() {
                 if (allqueued) return;
                 allqueued = true;
-                int where = parents().size();
                 state.invokeReductions(token, this, this, null);
             }
 
-            public void queueReductions(Node n2) {
-                if (!allqueued) { queueReductions(); return; }
-                state.invokeReductions(token, this, this, n2);
+            public void performReductions(Node n2) {
+                if (!allqueued) performReductions();
+                else            state.invokeReductions(token, this, this, n2);
             }
 
-            public final void invoke(Reduction r, Node n, Node n2) {
-                if (n==null) {
-                    if (r.numPop==0) r.reduce(this);
-                    return;
+            public void performEmptyReductions() { state.invokeReductions(token, this, null, null); }
+            public final void invoke(Position r, Node n, Node n2) {
+                if (n==null || n2==null || r.pos==0) {
+                    if (r.pos==0) {
+                        if (n==null) n = this;
+                        else return;
+                    }
+                    if (n==null) return;
+                    Forest[] holder = new Forest[r.pos];
+                    if (r.pos==0) n.finish(r, r.zero(), n.phase(), holder);
+                    else                   n.reduce(r, r.pos-1, n.phase(), holder);
+                } else {
+                    Forest[] holder = new Forest[r.pos];
+                    if (r.pos<=0) throw new Error("called wrong form of reduce()");
+                    int pos = r.pos-1;
+                    Forest old = holder[pos];
+                    holder[pos] = n.pending();
+                    if (pos==0) {
+                        System.arraycopy(holder, 0, r.holder, 0, holder.length);
+                        Forest rex = null;
+                        if (r.pos==1)  rex = singularReductions.get(this, r);
+                        if (rex==null) {
+                            rex = r.rewrite(n.phase().getLocation());
+                            if (r.pos==1) singularReductions.put(this, r, rex);
+                        }
+                        n2.finish(r, rex, n.phase(), holder);
+                    } else {
+                        n2.reduce(r, pos-1, n.phase(), holder);
+                    }
+                    holder[pos] = old;
+                }
+            }
+
+            public void reduce(Position r, int pos, Phase target, Forest[] holder) {
+                Forest old = holder[pos];
+                holder[pos] = this.pending();
+                if (pos==0) {
+                    System.arraycopy(holder, 0, r.holder, 0, holder.length);
+                    for(int i=0; i<r.pos; i++) if (r.holder[i]==null) throw new Error("realbad");
+                    Forest rex = null;
+                    if (r.pos==1)  rex = singularReductions.get(this, r);
+                    if (rex==null) {
+                        rex = r.rewrite(phase().getLocation());
+                        if (r.pos==1) singularReductions.put(this, r, rex);
+                    }
+                    for(Node child : this.parents()) child.finish(r, rex, target, holder);
+                } else {
+                    for(Node child : this.parents()) child.reduce(r, pos-1, target, holder);
                 }
-                if (r.numPop==0) return;
-                if (n2==null) r.reduce(n);
-                else          r.reduce(n, n2);
+                holder[pos] = old;
             }
-            public void queueEmptyReductions() {
-                if (!reducing) return;
-                state.invokeReductions(token, this, null, null);
+
+            public void finish(Position r, Forest result, Phase<Tok> target, Forest[] holder) {
+                Parser.Table<Tok>.State<Tok> state0 = state.gotoSetNonTerminals.get(r.owner());
+                if (result==null) throw new Error();
+                if (state0!=null)
+                    target.newNode(this, result, state0, r.pos<=0, r);
             }
 
-            private boolean fe;
-            public boolean dead = false;
-            public boolean redo = false;
-            private Node(Node parent, Forest pending, State state, boolean fe) {
-                this.fe = fe;
+            private Node(Node parent, Forest pending, State state) {
                 this.state = state;
-                for(Position p : state) {
-                    if (p.owner().needs!=null)
-                        for(Sequence s : p.owner().needs) {
-                            //dead = true;
-                            //redo = false;
-                        }
-                }
+                this.holder().merge(pending);
                 Phase start = parent==null ? null : parent.phase();
-                if (pending != null) this.holder().merge(pending);
                 if (parent != null) parents().add(parent, true);
-                if (Phase.this.hash.get(code(state, start)) != null) throw new Error("severe problem!");
-                Phase.this.hash.put(code(state, start), this);
-                Phase.this.numNodes++;
-                if (parent==null) holder().valid = true; // hack to make sure that the "base" node is always considered valid
+                if (Phase.this.hash.get(state, start) != null) throw new Error("severe problem!");
+                Phase.this.hash.put(state, start, this);
             }
+            public int toInt() { return idx; }
+            private final int idx = node_idx++;
         }
+        private int node_idx = 0;
 
+        public int toInt() { return pos+1; }
+        public int size() { return hash==null ? 0 : hash.size(); }
     }
 
-    /** helper method */
-    private static boolean equal(Object a, Object b) {
-        if (a==null && b==null) return true;
-        if (a==null || b==null) return false;
-        return a.equals(b);
-    }
-
-    /** this is something of a hack right now */
-    private static long code(State state, Phase start) {
-        return (((long)state.idx) << 32) | (start==null ? 0 : (start.pos+1));
-    }
 }