X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=inline;f=src%2Fedu%2Fberkeley%2Fsbp%2FForest.java;h=e39a8f676de7ad4a27ca1f174272d5568b443d81;hb=5eea0a7ad35fb17a5b7203fa40119ad5cab01ec0;hp=3795c9ad19d5cdb17a2a72d9f9d1195567a82086;hpb=815430f1fa820e28981bf4cff3fe15a4b9f5d97d;p=sbp.git
diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java
index 3795c9a..e39a8f6 100644
--- a/src/edu/berkeley/sbp/Forest.java
+++ b/src/edu/berkeley/sbp/Forest.java
@@ -1,81 +1,91 @@
+// Copyright 2006-2007 all rights reserved; see LICENSE file for BSD-style license
+
package edu.berkeley.sbp;
-import edu.berkeley.sbp.*;
-import edu.berkeley.sbp.Sequence.Position;
import edu.berkeley.sbp.util.*;
import java.io.*;
import java.util.*;
-import java.lang.reflect.*;
/**
+ *
* An efficient representation of a collection of trees (Tomita's
* shared packed parse forest).
+ *
*/
-public abstract class Forest implements GraphViz.ToGraphViz {
-
+public abstract class Forest implements GraphViz.ToGraphViz {
/** assume that this forest contains exactly one tree and return it; otherwise throw an exception */
- public abstract Tree expand1() throws Ambiguous;
+ public abstract Tree expand1() throws Ambiguous;
/** expand this forest into a set of trees */
- public void expand(HashSet> ht) { expand(ht, new HashSet>(), null); }
-
- /** create a new forest */
- public static Forest create(Input.Region loc, T head, Forest[] children, boolean unwrap) {
- return new One(loc, head, children, unwrap);
+ public Iterable> expand() {
+ HashSet> ht = new HashSet>();
+ expand(ht, new HashSet>(), null);
+ return ht;
}
+ /** returns the input Region which this Forest was parsed from */
+ public abstract Input.Region getRegion();
// Package-Private //////////////////////////////////////////////////////////////////////////////
- abstract void expand(HashSet> ht, HashSet> ignore, Tree bogus);
- abstract void gather(HashSet> ignore);
- boolean ambiguous() { return false; }
-
- public abstract void edges(GraphViz.Node n);
-
+ public static Forest create(Input.Region region, NodeType head, Forest[] children) {
+ return create(region, head, children, new boolean[children==null ? 0 : children.length]); }
+ public static Forest create(Input.Region region, NodeType head, Forest[] children, boolean[] lifts) {
+ if (region == null) throw new RuntimeException("invoked Forest.create(region=null) -- this should never happen");
+ return new One(region, head, children, lifts);
+ }
+ abstract void expand(HashSet> ht, HashSet> ignore, Tree bogus);
+ abstract void gather(HashSet> ignore);
+ abstract void edges(GraphViz.Node n);
+ boolean ambiguous() { return false; }
+
// One //////////////////////////////////////////////////////////////////////////////
/** A "single" forest with a head and child subforests */
- public static class One extends Forest {
+ private static class One extends Forest {
private final Input.Region location;
- private final T head;
- private final Forest[] children;
+ private final NodeType head;
+ private final Forest[] children;
/** if true, the last child's children are considered children of this node */
- private final boolean unwrap;
+ private final boolean[] lifts;
+
+ public Input.Region getRegion() { return location; }
- private One(Input.Region loc, T head, Forest[] children, boolean unwrap) {
+ private One(Input.Region loc, NodeType head, Forest[] children, boolean[] lifts) {
this.location = loc;
this.head = head;
+ if (head==null) throw new RuntimeException("invoked Forest.create(,null,,,) -- this should never happen");
this.children = children==null ? emptyForestArray : new Forest[children.length];
if (children != null) System.arraycopy(children, 0, this.children, 0, children.length);
if (children != null) for(int i=0; i expand1() throws Ambiguous {
- Tree[] ret = new Tree[children.length];
+ public Tree expand1() throws Ambiguous {
+ Tree[] ret = new Tree[children.length];
for(int i=0; i(location, head, ret, unwrap);
+ return new Tree(location, head, ret, lifts);
}
- public void gather(HashSet> hf) {
+ void gather(HashSet> hf) {
hf.add(this);
- for(Forest f : children) f.gather(hf);
+ for(Forest f : children) f.gather(hf);
}
- public void expand(HashSet> ht, HashSet> ignore, Tree bogus) {
+ void expand(HashSet> ht, HashSet> ignore, Tree bogus) {
if (ignore.contains(this)) { ht.add(bogus); return; }
expand(0, new Tree[children.length], ht, ignore, bogus);
}
- private void expand(final int i, Tree[] ta, HashSet> ht, HashSet> ignore, Tree bogus) {
+ private void expand(final int i, Tree[] ta, HashSet> ht, HashSet> ignore,
+ Tree bogus) {
if (i==children.length) {
- ht.add(new Tree(location, head, ta, unwrap));
+ ht.add(new Tree(location, head, ta, lifts));
} else {
- HashSet> ht2 = new HashSet>();
+ HashSet> ht2 = new HashSet>();
children[i].expand(ht2, ignore, bogus);
- for(Tree tc : ht2) {
+ for(Tree tc : ht2) {
ta[i] = tc;
expand(i+1, ta, ht, ignore, bogus);
ta[i] = null;
@@ -95,12 +105,12 @@ public abstract class Forest implements GraphViz.ToGraphViz {
edges(n);
return n;
}
- boolean edges = false;
+ boolean edges = false; // FIXME ??
public void edges(GraphViz.Node n) {
if (edges) return;
edges = true;
for(int i=0; i implements GraphViz.ToGraphViz {
// Many //////////////////////////////////////////////////////////////////////////////
/** An "ambiguity node"; this is immutable once it has been "looked at" */
- public static class Many extends Forest {
+ static class Many extends Forest {
- HashSet parents = new HashSet();
- private FastSet> hp = new FastSet>();
+ private FastSet> hp = new FastSet>();
private boolean touched = false;
public Many() { }
- public Iterator> iterator() {
- touched();
- return (Iterator>)hp.iterator(); // FIXME: fastset's iterator is not safe!
- }
+ public Input.Region getRegion() { return hp.iterator().next().getRegion(); } // all should be identical
- public Tree expand1() throws Ambiguous {
+ public Tree expand1() throws Ambiguous {
touched();
if (hp.size() > 1) {
- HashSet> hf0 = new HashSet>();
- Iterator> ih = hp.iterator();
+ HashSet> hf0 = new HashSet>();
+ Iterator> ih = hp.iterator();
ih.next().gather(hf0);
- for(Forest f : hp) {
- HashSet> hf1 = new HashSet>();
+ for(Forest f : hp) {
+ HashSet> hf1 = new HashSet>();
f.gather(hf1);
hf0.retainAll(hf1);
}
- HashSet> ht = new HashSet>();
+ HashSet> ht = new HashSet>();
expand(ht, hf0, new Tree(null, "*"));
throw new Ambiguous((Forest>)this,
(HashSet>)(Object)ht);
@@ -151,21 +157,31 @@ public abstract class Forest implements GraphViz.ToGraphViz {
return hp.iterator().next().expand1();
}
- public void gather(HashSet> ht) {
+ void gather(HashSet> ht) {
touched();
+
+ // FIXME: do something more sensible here
+ if (ht.contains(this)) {
+ System.err.println("WARNING: grammar produced a circular forest\n" + this);
+ //throw new Error("grammar produced a circular forest:\n" + this);
+ return;
+ }
+
ht.add(this);
- for(Forest f : hp) f.gather(ht);
+ for(Forest f : hp) f.gather(ht);
}
private void touched() {
if (touched) return;
touched = true;
- FastSet> f2 = new FastSet>();
+ /*
+ FastSet> f2 = new FastSet>();
for(Forest f : hp)
if (f instanceof Forest.One) f2.add(f);
- else for(Forest ff : ((Forest.Many)f))
+ else for(Forest ff : ((Forest.Many)f))
f2.add(ff);
hp = f2;
+ */
}
public boolean contains(Forest f) {
touched();
@@ -183,10 +199,10 @@ public abstract class Forest implements GraphViz.ToGraphViz {
return true;
}
- public void expand(HashSet> ht, HashSet> ignore, Tree bogus) {
+ void expand(HashSet> ht, HashSet> ignore, Tree bogus) {
touched();
if (ignore.contains(this)) { ht.add(bogus); return; }
- for (Forest f : hp) f.expand(ht, ignore, bogus);
+ for (Forest f : hp) f.expand(ht, ignore, bogus);
}