X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FGSS.java;h=0358ef64603ea89b392b28dfd1a6140290f1bd76;hp=8412471cf6e96ca04b35eb32fed33ab661f117d7;hb=a8478f5ddfbfbc8d910d09f27163cbd55752d3b6;hpb=dda22f5fe5cc0b84264c1a0d3369048c81a140f2 diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java index 8412471..0358ef6 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,27 @@ import java.util.*; import java.lang.reflect.*; /** implements Tomita's Graph Structured Stack */ -public class GSS { +class GSS { + + public static Queue removals = new LinkedList(); + + static String note = ""; + static int single_newnode = 0; + static int toplevel_reductions = 0; + static int multi_newnode = 0; + static int waiting_newnode = 0; + static int shifts = 0; - public static int count = 0; - public static int shifts = 0; - public static int reductions = 0; + static int count = 0; + static int reductions = 0; + int resets = 0; + int waits = 0; - public GSS() { } + Input input; - private Phase.Node[] reducing_list = null; - public int resets = 0; - public int waits = 0; + public GSS(Input input) { this.input = input; } + + private Node[] reducing_list = null; // FIXME: right now, these are the performance bottleneck HashMapBag waiting = new HashMapBag(); @@ -27,12 +39,16 @@ public class GSS { HashMapBag expected = new HashMapBag(); /** FIXME */ - public Forest.Ref 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 { + class Phase implements Invokable, IntegerMappable, GraphViz.ToGraphViz, Iterable { + + public int pos() { return pos; } + public boolean closed() { return closed; } + public Tok token() { return token; } - public Iterator iterator() { return hash.iterator(); } + public Iterator iterator() { return hash.iterator(); } public void invoke(State st, Forest result, Node n) { shifts++; good |= next.newNode(n, result, st, false); @@ -44,23 +60,29 @@ public class GSS { private final int pos; boolean reducing; - private IntPairMap hash; /* ALLOC */ + public IntPairMap hash; /* ALLOC */ private boolean closed; private boolean good; 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(); } @@ -71,7 +93,7 @@ public class GSS { lastperformed.clear(); lastperformed.addAll(performed); performed.clear(); - hash = new IntPairMap(); + hash = new IntPairMap(); reset = false; good = false; closed = false; @@ -84,11 +106,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 +164,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) { @@ -153,7 +183,7 @@ public class GSS { private boolean newNode2(Node p, Node parent, Forest pending, State state, boolean fromEmptyReduction) { if (p.merge(parent, pending)) return true; - p.parents().add(parent, true); + p.addParent(parent, true); if (p!=parent && !fromEmptyReduction && reducing) p.performReductions(parent); return true; } @@ -170,7 +200,7 @@ public class GSS { //return; } while(false); - Node n = new Node(parent, pending, state); // ALLOC + Node n = new Node(Phase.this, parent, pending, state); // ALLOC if (reducing) { n.performEmptyReductions(); if (!fromEmptyReduction) n.performReductions(parent); @@ -178,12 +208,14 @@ public class GSS { return true; } + public LinkedList reductionQueue = new LinkedList(); + /** perform all reduction operations */ public void reduce() throws ParseFailed { try { reducing = true; if (reducing_list==null || reducing_list.length < hash.size()) - reducing_list = new Phase.Node[hash.size() * 4]; + reducing_list = new Node[hash.size() * 4]; hash.toArray(reducing_list); int num = hash.size(); for(int i=0; i, IntegerMappable, GraphViz.ToGraphViz { - public FastSet set = new FastSet(); - - - private boolean allqueued = false; - - /** what state this node is in */ - public final Parser.Table.State 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; } - - private HashSet resultMap = new HashSet(); - public Iterable results() { return resultMap; } - public FastSet parents() { return set; } - public boolean merge(Node parent, Forest result) { - // FIXME: inefficient! - for(Forest.Ref f : results()) { - if (f.parents.contains(parent) /* UGLY: */ && f.parents.size()==1) { - f.merge(result); - return true; - } - } - Forest.Ref f = new Forest.Ref(); - f.parents.add(parent); - f.merge(result); - resultMap.add(f); - set.add(parent, true); - return false; - } - - public void performReductions() { - if (allqueued) return; - allqueued = true; - state.invokeReductions(token, this, this, null); - } - - public void performReductions(Node n2) { - if (!allqueued) performReductions(); - 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) { - reductions++; - if (n==null || n2==null || r.pos==0) { - if (r.pos==0) { - if (n==null) n = this; - else return; - } - if (n==null) return; - Forest[] holder = new Forest[r.pos]; - if (r.pos==0) n.finish(r, r.zero(), 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()"); - int pos = r.pos-1; - n.reduce(r, pos, n.phase(), n2); - } - } - - public void reduce(Position r, int pos, Phase target, Node only) { - Forest[] holder = r.holder; - Forest old = holder[pos]; - - HashSet rr = new HashSet(); - for(Forest result : results()) rr.add(result); - for(Forest result : rr) - for(Node child : ((Forest.Ref)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); - else child.reduce(r, pos-1, target, null); - } - - holder[pos] = old; - } - - public void finish(Position r, Forest result, Phase target) { - Parser.Table.State state0 = state.gotoSetNonTerminals.get(r.owner()); - if (result==null) throw new Error(); - if (state0!=null) - target.newNode(this, result, state0, r.pos<=0, r); - } - - private Node(Node parent, Forest pending, State state) { - this.state = state; - this.merge(parent, pending); - Phase start = parent==null ? null : parent.phase(); - if (parent != null) parents().add(parent, true); - 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++; - - // GraphViz ////////////////////////////////////////////////////////////////////////////// - - public GraphViz.Node toGraphViz(GraphViz gv) { - if (gv.hasNode(this)) return gv.createNode(this); - GraphViz.Node n = gv.createNode(this); - n.label = ""+state.toStringx(); - n.shape = "rectangle"; - n.fill = "green"; - for(Forest result : results()) n.edge(result, ""); - for(Node parent : parents()) n.edge(parent, ""); - ((GraphViz.Group)phase().toGraphViz(gv)).add(n); - return n; - } - public boolean isTransparent() { return false; } - public boolean isHidden() { return false; } - - } - private int node_idx = 0; public int toInt() { return pos+1; } public int size() { return hash==null ? 0 : hash.size(); } @@ -405,4 +343,5 @@ public class GSS { public boolean isHidden() { return false; } } + }