checkpoint

[sbp.git] / src / edu / berkeley / sbp / Element.java

diff --git a/src/edu/berkeley/sbp/Element.java b/src/edu/berkeley/sbp/Element.java
index b440257..7eb6a59 100644 (file)
--- a/src/edu/berkeley/sbp/Element.java
+++ b/src/edu/berkeley/sbp/Element.java
@@ -7,20 +7,15 @@ import java.util.*;
 import java.lang.reflect.*;
 import java.lang.ref.*;
 
-/** the root superclass for all components of the grammar (terminals, nonterminals, literals, etc) */
-public abstract class Element {
+/** <font color=green>the root superclass for all components of the grammar (terminals, nonterminals, literals, etc)</font> */
+public abstract class Element implements SequenceOrElement {
 
-    /** add all positions reachable from the start of this Element to @rp */
-    abstract void reachable(HashSet<Sequence.Position> rp);
+    /** sorry, you can't make up new, custom elements */
+    Element() { }
+
+    abstract StringBuffer toString(StringBuffer sb);
+
+    /** returns the Forest resulting from matching this element against the empty string */
+    Forest<?> epsilonForm() { throw new Error("element " + this + " has no epsilon form"); }
 
-    abstract Topology toAtom();
-    public Topology noFollow() { return null; }
-    Forest epsilonForm() { throw new Error("no epsilon form: " + this); }
-    final boolean possiblyEpsilon(Walk.Cache cache)   {
-        Boolean ret = cache==null ? null : cache.possiblyEpsilon.get(this);
-        if (ret != null) return ret.booleanValue();
-        ret = new Walk.PossiblyEpsilon().walk(this) ? Boolean.TRUE : Boolean.FALSE;
-        if (cache != null) cache.possiblyEpsilon.put(this, ret);
-        return ret;
-    }
 }