From dd9286cb6cab28051289fbab244d4b6a19619886 Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 29 May 2006 17:54:31 -0400 Subject: [PATCH 1/1] tentative checkpoint darcs-hash:20060529215431-5007d-725df35fdd3c552c95bcd97c583f37df6f66cd3e.gz --- src/edu/berkeley/sbp/Forest.java | 3 ++ src/edu/berkeley/sbp/GSS.java | 42 +++++------------------- src/edu/berkeley/sbp/misc/MetaGrammarTree.java | 6 ++++ 3 files changed, 18 insertions(+), 33 deletions(-) diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java index 1b92a76..bc31117 100644 --- a/src/edu/berkeley/sbp/Forest.java +++ b/src/edu/berkeley/sbp/Forest.java @@ -160,6 +160,9 @@ public abstract class Forest /*extends PrintableTree>*/ */ static class Ref extends Forest { public HashSet parents = new HashSet(); + public boolean contains(Forest f) { + return hp.contains(f); + } public boolean ambiguous() { if (hp.size()==0) return false; if (hp.size()==1) return hp.iterator().next().ambiguous(); diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java index 65af62e..9b091a7 100644 --- a/src/edu/berkeley/sbp/GSS.java +++ b/src/edu/berkeley/sbp/GSS.java @@ -146,13 +146,15 @@ 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); + 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; @@ -287,8 +289,6 @@ class GSS { 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 */ @@ -296,14 +296,15 @@ class GSS { /** 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) { + public Iterable results() { return resultMap; } + public FastSet 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(); @@ -311,27 +312,8 @@ class GSS { 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); + return false; } - */ - public FastSet parents() { return set; } public void performReductions() { if (allqueued) return; @@ -346,7 +328,6 @@ class GSS { 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; @@ -367,11 +348,6 @@ class GSS { public void reduce(Position r, int pos, Phase target, Forest[] holder, Node only) { Forest old = holder[pos]; - // 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; diff --git a/src/edu/berkeley/sbp/misc/MetaGrammarTree.java b/src/edu/berkeley/sbp/misc/MetaGrammarTree.java index 3fccd34..6191299 100644 --- a/src/edu/berkeley/sbp/misc/MetaGrammarTree.java +++ b/src/edu/berkeley/sbp/misc/MetaGrammarTree.java @@ -71,6 +71,9 @@ public class MetaGrammarTree { + + + // DO NOT EDIT STUFF BELOW: IT IS AUTOMATICALLY GENERATED new edu.berkeley.sbp.Tree(null, "grammar", new edu.berkeley.sbp.Tree[] { new edu.berkeley.sbp.Tree(null, null, new edu.berkeley.sbp.Tree[] { new edu.berkeley.sbp.Tree(null, "=", new edu.berkeley.sbp.Tree[] { new edu.berkeley.sbp.Tree(null, null, new edu.berkeley.sbp.Tree[] { new edu.berkeley.sbp.Tree(null, "G", new edu.berkeley.sbp.Tree[] { }), new edu.berkeley.sbp.Tree(null, "r", new edu.berkeley.sbp.Tree[] { }), @@ -618,3 +621,6 @@ new edu.berkeley.sbp.Tree(null, "grammar", new edu.berkeley.sbp.Tree[] { new edu + + + -- 1.7.10.4