checkpoint

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

diff --git a/src/edu/berkeley/sbp/Atom.java b/src/edu/berkeley/sbp/Atom.java
index 0722d0b..0989bc0 100644 (file)
--- a/src/edu/berkeley/sbp/Atom.java
+++ b/src/edu/berkeley/sbp/Atom.java
@@ -7,24 +7,12 @@ import edu.berkeley.sbp.util.*;
 import edu.berkeley.sbp.*;
 import edu.berkeley.sbp.*;
 
-/** an element which matches exactly one input token */
-public abstract class Atom<T extends Token> extends Element {
+/** <font color=green>an element which matches exactly one input token</font> */
+public abstract class Atom<T> extends Element implements Topology<Atom<T>> {
 
-    private final Topology<T> rt;
+    public  abstract Topology<T>  underlying();
+    public    abstract String       toString();
+    public             StringBuffer toString(StringBuffer sb) { sb.append(this); return sb; }
 
-    public Atom(Topology<T> rt) { this.rt = rt; }
-
-    Topology<T> top() { return rt; }
-
-    void reachable(HashSet<Sequence.Position> h) { /* do-nothing */ }
-
-    /** equality is based on the underlying <tt>Topology</tt> */
-    public int hashCode() { return rt.hashCode(); }
-    
-    /** equality is based on the underlying <tt>Topology</tt> */
-    public boolean equals(Object o) { return o != null && o instanceof Atom && ((Atom)o).rt.equals(rt); }
-
-    /** declared abstract to force subclasses to override it in a useful manner */
-    public abstract String toString();
 }