X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FGSS.java;h=2154731274229e22643d1775550864f295eab26a;hp=becea959c82f618ae8bc2d87e8a7d25b38c1cddb;hb=474037fe8463b96dfaf0209be157cbf5223a0910;hpb=aeae43c3255b14e4ba65e0171b87c48bbf953c31

diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java
index becea95..2154731 100644
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -1,8 +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 java.io.*;
 import java.util.*;
 import java.lang.reflect.*;
@@ -10,39 +10,46 @@ import java.lang.reflect.*;
 /** implements Tomita's Graph Structured Stack */
 class GSS {
 
+    public static int count = 0;
     public GSS() { }
 
     private Phase.Node[] reducing_list = null;
     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>, IntegerMappable {
+    class Phase<Tok> implements Invokable<State, Forest, Phase<Tok>.Node>, IntegerMappable {
+
+        public void invoke(State st, Forest result, Node n) {
+            good |= next.newNode(n, result, st, false);
+        }
 
         /** the token immediately after this phase */
-        final Token token;
+        final Tok token;
 
         private final int pos;
 
         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, Token token, Token.Location location, Forest forest) {
+        public Phase(Phase prev, Parser parser, Phase previous, Tok token, Input.Location location, Forest forest) throws ParseFailed {
             this.prev = prev;
             this.forest = forest;
             this.parser = parser;
@@ -53,10 +60,14 @@ class GSS {
             reset();
         }
 
-        public void reset() {
+        public void reset() throws ParseFailed {
             waiting.clear();
             performed.clear();
             hash = new IntPairMap<Phase.Node>();
+            singularReductions = new IntPairMap<Forest>();
+            expectedInhibit.clear();
+            expectedInhibit.addAll(inhibited);
+            reset = false;
             good = false;
             closed = false;
             reducing = false;
@@ -72,7 +83,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
@@ -104,7 +115,7 @@ class GSS {
             }
             if (!owner.lame)
                 newNode(parent, pending, state, fromEmptyReduction);
-            if (reduction!=null) inhibit(reduction, parent==null?0:parent.phase().pos);
+            if (reduction!=null) uninhibit(reduction, parent==null?0:parent.phase().pos);
             if (reduction != null) {
                 boolean redo = true;
                 while(redo) {
@@ -147,19 +158,19 @@ class GSS {
             return true;
         }
 
-        public void uninhibit(int p, Sequence s) {
+        public void inhibit(int p, Sequence s) {
             if (s.hated!=null)
                 for(Sequence s2 : s.hated)
                     inhibited.remove(p, s2);
         }
 
-        public void inhibit(Position r, int p) {
+        public void uninhibit(Position r, int p) {
             if (r.owner().hated == null) return;
             // remember that dead states are still allowed to shift -- just not allowed to reduce
             boolean reset = false;
             for(Sequence seq : r.owner().hated) {
                 if (performed.contains(p,seq)) {
-                    uninhibit(p, seq);
+                    inhibit(p, seq);
                     //System.out.println("\nresetting due to " + r.owner() + " killing " + seq);
                     //inhibited.clear();
                     inhibited.add(p, seq);
@@ -169,11 +180,12 @@ class GSS {
                     throw new Reset();
                 }
                 inhibited.add(p, seq);
+                expectedInhibit.remove(p, seq);
             }
         }
         
         /** perform all reduction operations */
-        public void reduce() {
+        public void reduce() throws ParseFailed{
             try {
                 reducing = true;
                 if (reducing_list==null || reducing_list.length < hash.size())
@@ -190,22 +202,28 @@ 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();
             }
+            count = 0;
         }
 
+        private boolean reset = false;
         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 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 +238,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()),
@@ -228,7 +249,7 @@ class GSS {
         }
 
 
-        public class Waiting {
+        class Waiting {
             Node parent;
             Forest pending;
             State state;
@@ -251,13 +272,13 @@ class GSS {
         // Node /////////////////////////////////////////////////////////////////////////////////
 
         /** a node in the GSS */
-        public final class Node extends FastSet<Node> implements Invokable<Position, Node, Node> {
+        final class Node extends FastSet<Node> implements Invokable<Position, Node, Node>, IntegerMappable {
 
             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; }
@@ -276,6 +297,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) {
@@ -290,42 +312,44 @@ class GSS {
                     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 = r.rewrite(n.phase().getLocation());
-                        n2.finish(r, rex, n.phase(), holder);
-                    } else {
-                        n2.reduce(r, pos-1, n.phase(), holder);
-                    }
-                    holder[pos] = old;
+                    n.reduce(r, pos, n.phase(), holder, n2);
                 }
             }
 
-            public void reduce(Position r, int pos, GSS.Phase target, Forest[] holder) {
+            public void reduce(Position r, int pos, Phase target, Forest[] holder) { reduce(r, pos, target, holder, null); }
+            public void reduce(Position r, int pos, Phase target, Forest[] holder, Node only) {
                 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 = r.rewrite(target.getLocation());
-                    for(GSS.Phase.Node child : this.parents()) child.finish(r, rex, target, holder);
+                    Forest rex = null;
+
+                    // FIXME: I'm unsure about this -- basically we want to deal with the case where
+                    //        there are two nodes, each of whose Ref points to the same Forest instance.
+                    //        Some node in the next phase has both of these as parents.  This might happen
+                    //        since the same reduction can appear in more than one state.
+                    if (r.pos==1)  rex = singularReductions.get(this.pending(), r);
+                    if (rex==null) {
+                        rex = r.rewrite(phase().getLocation());
+                        if (r.pos==1) singularReductions.put(this.pending(), r, rex);
+                    }
+                    if (only != null)  only.finish(r, rex, target, holder);
+                    else               for(Node child : this.parents()) child.finish(r, rex, target, holder);
                 } else {
-                    for(GSS.Phase.Node child : this.parents()) child.reduce(r, pos-1, target, holder);
+                    if (only != null)  only.reduce(r, pos-1, target, holder);
+                    else               for(Node child : this.parents()) child.reduce(r, pos-1, target, holder);
                 }
                 holder[pos] = old;
             }
 
-            public void finish(Position r, Forest result, GSS.Phase target, Forest[] holder) {
-                State state0 = state.gotoSetNonTerminals.get(r.owner());
+            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);
             }
 
-            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 +358,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(); }