boolean reducing;
private IntPairMap<Phase.Node> hash; /* ALLOC */
- private IntPairMap<Forest> singularReductions; /* ALLOC */
private boolean closed;
private boolean good;
private Phase next = null;
lastperformed.addAll(performed);
performed.clear();
hash = new IntPairMap<Phase.Node>();
- singularReductions = new IntPairMap<Forest>();
reset = false;
good = false;
closed = false;
}
}
}
+
private boolean newNode2(Node p, Node parent, Forest pending, State state, boolean fromEmptyReduction) {
//if (p.parents().contains(parent)) return true;
- p.merge(parent, pending);
+ if (p.merge(parent, pending)) return true;
p.parents().add(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;
// this massively improves GC performance
if (prev!=null && parser.helpgc) {
prev.hash = null;
- prev.singularReductions = null;
}
this.next = next;
closed = true;
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 */
/** 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<Node,Forest> resultMap = new HashMap<Node,Forest>();
private HashSet<Forest.Ref> resultMap = new HashSet<Forest.Ref>();
- public void merge(Node parent, Forest result) {
+ public Iterable<Forest.Ref> results() { return resultMap; }
+ public FastSet<Node> parents() { return set; }
+ public boolean merge(Node parent, Forest result) {
for(Forest.Ref f : results()) {
- if (f.parents.contains(parent) && f.parents.size()==1) {
+ if (f.parents.contains(parent) /* UGLY: */ && f.parents.size()==1) {
f.merge(result);
- return;
+ return true;
}
}
Forest.Ref f = new Forest.Ref();
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<Forest.Ref> 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);
+ return false;
}
- */
- public FastSet<Node> parents() { return set; }
public void performReductions() {
if (allqueued) return;
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;
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 n.reduce(r, r.pos-1, n.phase(), holder, 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);
+ n.reduce(r, pos, n.phase(), holder, n2);
}
}
- /*
- 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;
+
+ for(Forest result : results())
+ for(Node child : ((Forest.Ref<?>)result).parents) {
+ if (only != null && child!=only) continue;
+ holder[pos] = result;
+ if (pos==0) {
System.arraycopy(holder, 0, r.holder, 0, holder.length);
for(int i=0; i<r.pos; i++) if (r.holder[i]==null) throw new Error("realbad");
- Forest rex = null;
- if (r.pos==1) rex = singularReductions.get(pending, r);
- if (rex==null) {
- rex = r.rewrite(phase().getLocation());
- if (r.pos==1) singularReductions.put(pending, r, rex);
- }
- child.finish(r, rex, target, holder);
- }
- } else {
- for(Forest result : results())
- for(Node child : ((Forest.Ref<?>)result).parents) {
- if (only!=null && child!=only) continue;
- holder[pos] = result;
- child.reduce(r, pos-1, target, holder, null, null);
+ child.finish(r, r.rewrite(phase().getLocation()), target, holder);
+ } else {
+ child.reduce(r, pos-1, target, holder, null);
}
- }
+ }
+
holder[pos] = old;
}
projects / sbp.git / blobdiff