X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FGSS.java;h=b36b293094276d048676d096e3258779394df973;hp=217889b49d2ab7570522ad4c57c6d114e6972e49;hb=2c05c84a714f54b3bc026f51416492ddb13f33b1;hpb=3ee451bce342d4bb61ad6235ba57bdf817bfdd1a

diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java
index 217889b..b36b293 100644
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -18,7 +18,9 @@ class GSS {
     int resets = 0;
     int waits = 0;
     
-    public GSS() { }
+    Input input;
+
+    public GSS(Input input) { this.input = input; }
 
     private Phase.Node[] reducing_list = null;
 
@@ -53,11 +55,15 @@ class GSS {
         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, Input.Location nextLocation, 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;
@@ -88,11 +94,15 @@ 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());
+                throw new ParseFailed(ParseFailed.error(("unexpected end of file\n"),
+                                                        token, hash.values()),
+                                      getLocation().createRegion(getLocation()), input);
             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)
@@ -243,14 +253,14 @@ class GSS {
             }
 
             if (!good && token!=null)
-                throw new ParseFailed(ParseFailed.error(ANSI.red("unexpected character ")+" \'"+
+                throw new ParseFailed(ParseFailed.error(("unexpected character ")+" \'"+
                                                         ANSI.purple(StringUtil.escapify(token+"", "\\\'\r\n"))+
                                                         "\' encountered at "+
-                                                        ANSI.green(getLocation())+"\n", token, hash.values()),
-                                        getLocation());
+                                                        ANSI.green(next.getRegion())+"\n", token, hash.values()),
+                                        next.getRegion(), input);
             if (token==null && finalResult==null)
-                throw new ParseFailed(ParseFailed.error(ANSI.red("unexpected end of file\n"), token, hash.values()),
-                                        getLocation());
+                throw new ParseFailed(ParseFailed.error(("unexpected end of file at "+getLocation()+"\n"), token, hash.values()),
+                                      getLocation().createRegion(getLocation()), input);
         }
 
 
@@ -348,7 +358,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().getNextLocation().createRegion(target.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);
                     }