X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FGSS.java;h=5255a21a65da9649d02dc0af5c5b998d82b49a66;hb=972303162555284f8066047d3caead8df139afd4;hp=f85ec0b9768e9026627f9eafeadd51f91f9473c7;hpb=297f374e023e781f38f3fb2d6122c951f224380e;p=sbp.git diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java index f85ec0b..5255a21 100644 --- a/src/edu/berkeley/sbp/GSS.java +++ b/src/edu/berkeley/sbp/GSS.java @@ -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 waiting = new HashMapBag(); @@ -27,7 +31,7 @@ public class GSS { HashMapBag expected = new HashMapBag(); /** FIXME */ - public Forest.Many finalResult; + Forest.Many finalResult; /** corresponds to a positions between tokens the input stream; same as Tomita's U_i's */ class Phase implements Invokable.Node>, IntegerMappable, GraphViz.ToGraphViz, Iterable { @@ -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) { @@ -239,14 +257,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); } @@ -325,7 +351,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 +370,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); }