X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FGSS.java;h=0358ef64603ea89b392b28dfd1a6140290f1bd76;hp=bde44df40c8af28d1dd3d1d9f45e2fe31adc800f;hb=a8478f5ddfbfbc8d910d09f27163cbd55752d3b6;hpb=ef61db31ac4d0674b5206803ea04013d6292cf3d diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java index bde44df..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.*; @@ -10,27 +12,45 @@ import java.lang.reflect.*; /** implements Tomita's Graph Structured Stack */ class GSS { - public static int count = 0; + 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; + + static int count = 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; + private Node[] reducing_list = null; + // FIXME: right now, these are the performance bottleneck HashMapBag waiting = new HashMapBag(); HashMapBag performed = new HashMapBag(); HashMapBag lastperformed = new HashMapBag(); 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 Iterator iterator() { return hash.iterator(); } + public int pos() { return pos; } + public boolean closed() { return closed; } + public Tok token() { return token; } + + public Iterator iterator() { return hash.iterator(); } public void invoke(State st, Forest result, Node n) { + shifts++; good |= next.newNode(n, result, st, false); } @@ -40,24 +60,29 @@ class GSS { private final int pos; boolean reducing; - private IntPairMap hash; /* ALLOC */ - private IntPairMap singularReductions; /* 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(); } @@ -68,8 +93,7 @@ class GSS { lastperformed.clear(); lastperformed.addAll(performed); performed.clear(); - hash = new IntPairMap(); - singularReductions = new IntPairMap(); + hash = new IntPairMap(); reset = false; good = false; closed = false; @@ -82,11 +106,20 @@ 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 @@ -131,8 +164,7 @@ class GSS { } } } - if (!owner.lame) - newNode(parent, pending, state, fromEmptyReduction); + newNode(parent, pending, state, fromEmptyReduction); if (reduction != null) { boolean redo = true; while(redo) { @@ -148,13 +180,14 @@ class GSS { } } } + private boolean newNode2(Node p, Node parent, Forest pending, State state, boolean fromEmptyReduction) { - //if (p.parents().contains(parent)) return true; - p.merge(parent, pending); - p.parents().add(parent, true); + if (p.merge(parent, pending)) return true; + p.addParent(parent, true); if (p!=parent && !fromEmptyReduction && reducing) p.performReductions(parent); return true; } + private boolean newNode3(Node parent, Forest pending, State state, boolean fromEmptyReduction) { do { if (token != null && state.canShift(token)) break; @@ -167,7 +200,7 @@ 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); @@ -175,12 +208,14 @@ 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(); - - 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"; - //GraphViz.Node f = pending().toGraphViz(gv); - //n.add(f); - 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 Forest.Ref holder = new Forest.Ref(); - 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 HashMap resultMap = new HashMap(); - - private HashSet resultMap = new HashSet(); - public void merge(Node parent, Forest result) { - for(Forest.Ref f : results()) { - if (f.parents.contains(parent) && f.parents.size()==1) { - f.merge(result); - return; - } - } - Forest.Ref f = new Forest.Ref(); - f.parents.add(parent); - f.merge(result); - resultMap.add(f); - set.add(parent, true); - /* - Forest.Ref f = (Forest.Ref)resultMap.get(parent); - if (f==null) { f = new Forest.Ref(); resultMap.put(parent, f); } - f.merge(result); - set.add(parent, true); - */ - } - public Iterable results() { return resultMap; } - //private Forest pending(Node n) { - //return !Phase.this.closed ? holder : holder.resolve(); - /* - for(Forest f : resultMap) - if (resultMap.contains(f, n)) - return f; - return null; - */ - /* - return resultMap.get(n); - } - */ - public FastSet parents() { return set; } - - 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) { - //if (r.owner().lame) return; - 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(), holder); - else n.reduce(r, r.pos-1, n.phase(), holder, null, null); - } else { - Forest[] holder = new Forest[r.pos]; - if (r.pos<=0) throw new Error("called wrong form of reduce()"); - int pos = r.pos-1; - n.reduce(r, pos, n.phase(), holder, n2, null); - } - } - - /* - public void reduce(Position r, int pos, Phase target, Forest[] holder) { - reduce(r, pos, target, holder, null); } - public void reduce(Position r, int pos, Phase target, Forest[] holder, Node only) { - reduce(r, pos, target, holder, only, this.pending()); - } - */ - public void reduce(Position r, int pos, Phase target, Forest[] holder, Node only, Forest pending) { - Forest old = holder[pos]; - holder[pos] = pending; - if (pos==0) { - - // FIXME: I'm unsure about this -- basically we want to deal with the case where - // there are two nodes, each of whose Ref points to the same Forest instance. - // Some node in the next phase has both of these as parents. This might happen - // since the same reduction can appear in more than one state. - - for(Forest result : results()) - for(Node child : ((Forest.Ref)result).parents) { - if (only != null && child!=only) continue; - pending = holder[pos] = result; - System.arraycopy(holder, 0, r.holder, 0, holder.length); - for(int i=0; i)result).parents) { - if (only!=null && child!=only) continue; - holder[pos] = result; - child.reduce(r, pos-1, target, holder, null, null); - } - } - holder[pos] = old; - } - - public void finish(Position r, Forest result, Phase target, Forest[] holder) { - 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++; - } - private int node_idx = 0; public int toInt() { return pos+1; } public int size() { return hash==null ? 0 : hash.size(); } @@ -446,4 +343,5 @@ class GSS { public boolean isHidden() { return false; } } + }