questionable hack to reduce maximum stack depth
[sbp.git] / src / edu / berkeley / sbp / GSS.java
index f85ec0b..ac62e18 100644 (file)
@@ -1,3 +1,5 @@
+// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license
+
 package edu.berkeley.sbp;
 import edu.berkeley.sbp.*;
 import edu.berkeley.sbp.util.*;
@@ -8,17 +10,19 @@ import java.util.*;
 import java.lang.reflect.*;
 
 /** implements Tomita's Graph Structured Stack */
-public class GSS {
+class GSS {
 
-    public static int count = 0;
-    public static int shifts = 0;
-    public static int reductions = 0;
+    static int count = 0;
+    static int shifts = 0;
+    static int reductions = 0;
+    int resets = 0;
+    int waits = 0;
     
-    public GSS() { }
+    Input input;
+
+    public GSS(Input input) { this.input = input; }
 
     private Phase.Node[] reducing_list = null;
-    public int resets = 0;
-    public int waits = 0;
 
     // FIXME: right now, these are the performance bottleneck
     HashMapBag<Sequence,Phase.Waiting> waiting         = new HashMapBag<Sequence,Phase.Waiting>();
@@ -27,7 +31,7 @@ public class GSS {
     HashMapBag<Integer,Sequence>       expected        = new HashMapBag<Integer,Sequence>();
     
     /** FIXME */
-    public  Forest.Many finalResult;
+    Forest.Many finalResult;
 
     /** corresponds to a positions <i>between tokens</i> the input stream; same as Tomita's U_i's */
     class Phase<Tok> implements Invokable<State, Forest, Phase<Tok>.Node>, IntegerMappable, GraphViz.ToGraphViz, Iterable<Phase.Node> {
@@ -50,17 +54,23 @@ public class GSS {
         private Phase next = null;
         private Phase prev;
         private Input.Location location;
+        private Input.Location nextLocation;
+        private Input.Location prevLocation;
+        
         public final Parser parser;
 
         private Forest forest;
 
-        public Phase(Phase prev, Parser parser, Phase previous, Tok token, Input.Location location, Forest forest) throws ParseFailed {
+        public Phase(Phase prev, Parser parser, Phase previous, Tok token, Input.Location location,
+                     Input.Location nextLocation, Forest forest) throws ParseFailed {
+            this.prevLocation = prev==null ? location : prev.getLocation();
             this.prev = prev;
             this.forest = forest;
             this.parser = parser;
             this.pos = previous==null ? 0 : previous.pos+1;
             this.token = token;
             this.location = location;
+            this.nextLocation = nextLocation;
             performed.clear();
             reset();
         }
@@ -84,11 +94,20 @@ public class GSS {
         public boolean isDone() throws ParseFailed {
             if (token != null) return false;
             if (token==null && finalResult==null)
-                throw new ParseFailed(ParseFailed.error(ANSI.red("unexpected end of file\n"), token, hash.values()), getLocation());
+                ParseFailed.error("unexpected end of file",
+                                  getLocation(),
+                                  token,
+                                  hash.values(),
+                                  getLocation().createRegion(getLocation()),
+                                  input,
+                                  GSS.this);
             return true;
         }
 
+        public Input.Location getPrevLocation() { return prevLocation; }
         public Input.Location getLocation() { return location; }
+        public Input.Region   getRegion() { return getPrevLocation().createRegion(getLocation()); }
+        public Input.Location getNextLocation() { return nextLocation; }
 
         /** add a new node (merging with existing nodes if possible)
          *  @param parent             the parent of the new node
@@ -133,8 +152,7 @@ public class GSS {
                             }
                 }
             }
-            if (!owner.lame)
-                newNode(parent, pending, state, fromEmptyReduction);
+            newNode(parent, pending, state, fromEmptyReduction);
             if (reduction != null) {
                 boolean redo = true;
                 while(redo) {
@@ -178,6 +196,8 @@ public class GSS {
             return true;
         }
 
+        LinkedList<Node> reductionQueue = new LinkedList<Node>();
+
         /** perform all reduction operations */
         public void reduce() throws ParseFailed {
             try {
@@ -192,9 +212,11 @@ public class GSS {
                     // 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];
+                    reductionQueue.add(reducing_list[i]);
                     reducing_list[i] = null;
-                    n.performReductions();
+                }
+                while(!reductionQueue.isEmpty()) {
+                    reductionQueue.remove().performReductions();
                 }
                 if (reset) {
                     reset = false;
@@ -239,14 +261,22 @@ public class GSS {
             }
 
             if (!good && token!=null)
-                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());
+                ParseFailed.error("unexpected character",
+                                  getLocation(),
+                                  token,
+                                  hash.values(),
+                                  getRegion(),
+                                  input,
+                                  GSS.this);
+
             if (token==null && finalResult==null)
-                throw new ParseFailed(ParseFailed.error(ANSI.red("unexpected end of file\n"), token, hash.values()),
-                                        getLocation());
+                ParseFailed.error("unexpected end of file",
+                                  getLocation(),
+                                  token,
+                                  hash.values(),
+                                  getLocation().createRegion(getLocation()),
+                                  input,
+                                  GSS.this);
         }
 
 
@@ -275,8 +305,6 @@ public class GSS {
         /** a node in the GSS */
         final class Node implements Invokable<Position, Node, Node>, IntegerMappable, GraphViz.ToGraphViz {
             public FastSet<Node> set = new FastSet<Node>();
-
-           
             private boolean allqueued = false;
 
             /** what state this node is in */
@@ -311,7 +339,7 @@ public class GSS {
             }
 
             public void performReductions(Node n2) {
-                if (!allqueued) performReductions();
+                if (!allqueued) reductionQueue.add(this);//performReductions();
                 else            state.invokeReductions(token, this, this, n2);
             }
 
@@ -325,7 +353,7 @@ public class GSS {
                     }
                     if (n==null) return;
                     Forest[] holder = new Forest[r.pos];
-                    if (r.pos==0) n.finish(r, r.zero(), n.phase());
+                    if (r.pos==0) n.finish(r, r.zero(n.phase().getLocation().createRegion(n.phase().getLocation())), n.phase());
                     else          n.reduce(r, r.pos-1,  n.phase(), null);
                 } else {
                     if (r.pos<=0) throw new Error("called wrong form of reduce()");
@@ -344,7 +372,7 @@ public class GSS {
                     for(Node child : ((Forest.Many<?>)result).parents) {
                         if (only != null && child!=only) continue;
                         holder[pos] = result;
-                        if (pos==0) child.finish(r, r.rewrite(new Input.Region(child.phase().getLocation(), phase().getLocation())), target);
+                        if (pos==0) child.finish(r, r.rewrite(child.phase().getLocation().createRegion(target.getLocation())), target);
                         else        child.reduce(r, pos-1, target, null);
                     }