X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FGSS.java;h=5ede971081945b877165a3a7945a5889cc82fee2;hp=816c0860364e43c5c2f78b32ee53cd835826521e;hb=2cca97362e80d5a3cd3e02d791a10cd7c6f6b29c;hpb=cd8ef445dd069efec7d47ab1df0c1f93caa2beac

diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java
index 816c086..5ede971 100644
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -50,17 +50,19 @@ class GSS {
         private Phase next = null;
         private Phase prev;
         private Input.Location location;
+        private Input.Location nextLocation;
         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.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();
         }
@@ -89,6 +91,7 @@ class GSS {
         }
 
         public Input.Location getLocation() { return location; }
+        public Input.Location getNextLocation() { return nextLocation; }
 
         /** add a new node (merging with existing nodes if possible)
          *  @param parent             the parent of the new node
@@ -343,7 +346,7 @@ 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(child.phase().getLocation().createRegion(phase().getLocation())), target);
+                        if (pos==0) child.finish(r, r.rewrite(child.phase().getNextLocation().createRegion(target.getLocation())), target);
                         else        child.reduce(r, pos-1, target, null);
                     }