checkpoint

[sbp.git] / src / edu / berkeley / sbp / GSS.java

diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java
index 5bfbd52..89a16ed 100644 (file)
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -16,9 +16,10 @@ 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;
@@ -37,16 +38,17 @@ class GSS {
 
         boolean reducing;
         private IntPairMap<Phase.Node> hash;  /* ALLOC */
+        private IntPairMap<Forest> singularReductions;  /* ALLOC */
         private boolean closed;
         private boolean good;
         private Phase next = null;
         private Phase prev;
-        private Token.Location location;
+        private Input.Location location;
         public final Parser parser;
 
         private Forest forest;
 
-        public Phase(Phase prev, Parser parser, Phase previous, Tok 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;
@@ -61,6 +63,9 @@ class GSS {
             waiting.clear();
             performed.clear();
             hash = new IntPairMap<Phase.Node>();
+            singularReductions = new IntPairMap<Forest>();
+            expectedInhibit.clear();
+            expectedInhibit.addAll(inhibited);
             good = false;
             closed = false;
             reducing = false;
@@ -76,7 +81,7 @@ class GSS {
             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
@@ -173,6 +178,7 @@ class GSS {
                     throw new Reset();
                 }
                 inhibited.add(p, seq);
+                expectedInhibit.remove(p, seq);
             }
         }
         
@@ -194,6 +200,11 @@ class GSS {
                     reducing_list[i] = null;
                     n.performReductions();
                 }
+                if (expectedInhibit.size() > 0) {
+                    inhibited.removeAll(expectedInhibit);
+                    System.out.println("\n!!!!\n");
+                    throw new Reset();
+                }
             } catch (Reset r) {
                 reset();
                 reduce();
@@ -205,7 +216,10 @@ class GSS {
         /** perform all shift operations, adding promoted nodes to <tt>next</tt> */
         public void shift(Phase next, Forest result) throws ParseFailed {
             // this massively improves GC performance
-            if (prev!=null) prev.hash = null;
+            if (prev!=null) {
+                prev.hash = null;
+                prev.singularReductions = null;
+            }
             this.next = next;
             closed = true;
             Forest res = null;
@@ -220,7 +234,10 @@ class GSS {
             }
 
             if (!good && token!=null)
-                throw new ParseFailed(ParseFailed.error(ANSI.red("unexpected character")+" "+ANSI.purple(token)+" encountered at "+ANSI.green(getLocation())+"\n", token, hash.values()),
+                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 ParseFailed(ParseFailed.error(ANSI.red("unexpected end of file\n"), token, hash.values()),
@@ -251,7 +268,7 @@ class GSS {
         // Node /////////////////////////////////////////////////////////////////////////////////
 
         /** a node in the GSS */
-        public final class Node extends FastSet<Node> implements Invokable<Position, Node, Node> {
+        public final class Node extends FastSet<Node> implements Invokable<Position, Node, Node>, IntegerMappable {
 
             private Forest.Ref holder = null;
             private boolean allqueued = false;
@@ -276,6 +293,7 @@ class GSS {
                 else            state.invokeReductions(token, this, this, n2);
             }
 
+            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) {
@@ -294,7 +312,12 @@ class GSS {
                     holder[pos] = n.pending();
                     if (pos==0) {
                         System.arraycopy(holder, 0, r.holder, 0, holder.length);
-                        Forest rex = r.rewrite(n.phase().getLocation());
+                        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);
@@ -309,7 +332,12 @@ class GSS {
                 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 = r.rewrite(target.getLocation());
+                    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);
@@ -324,8 +352,6 @@ class GSS {
                     target.newNode(this, result, state0, r.pos<=0, r);
             }
 
-            public void performEmptyReductions() { state.invokeReductions(token, this, null, null); }
-
             private Node(Node parent, Forest pending, State state) {
                 this.state = state;
                 this.holder().merge(pending);
@@ -334,7 +360,10 @@ class GSS {
                 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(); }