X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fedu%2Fberkeley%2Fsbp%2FAtom.java;h=b9832b2d313c20a3ea314359a3d746ab91b83bbe;hb=0e17670bcfa7b0fe8eb3a2cac81f4b080a09fc98;hp=0722d0b8d571905990655c76849c840e21e3de24;hpb=0a0227b9180534d2a431f3d6e08a398bde2244c4;p=sbp.git

diff --git a/src/edu/berkeley/sbp/Atom.java b/src/edu/berkeley/sbp/Atom.java
index 0722d0b..b9832b2 100644
--- a/src/edu/berkeley/sbp/Atom.java
+++ b/src/edu/berkeley/sbp/Atom.java
@@ -7,24 +7,26 @@ 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<T> {
+
+    protected abstract Topology<T> top();
+    public    abstract String       toString();
+    public             StringBuffer toString(StringBuffer sb) { sb.append(this); return sb; }
+
+    // Topology Thunks //////////////////////////////////////////////////////////////////////////////
+
+    public Topology<T>       unwrap()                   { return top().unwrap(); }
+    public Topology<T>       empty()                    { return top().empty(); }
+    public boolean           contains(T v)              { return top().contains(v); }
+    public Topology<T>       intersect(Topology<T> t)   { return top().intersect(t); }
+    public Topology<T>       minus(Topology<T> t)       { return top().minus(t); }
+    public Topology<T>       union(Topology<T> t)       { return top().union(t); }
+    public Topology<T>       complement()               { return top().complement(); }
+    public boolean           disjoint(Topology<T> t)    { return top().disjoint(t); }
+    public boolean           containsAll(Topology<T> t) { return top().containsAll(t); }
+    public int               hashCode()                 { return top().hashCode(); }
+    public boolean           equals(Object o)           { return o != null && o instanceof Atom && ((Atom)o).top().equals(top()); }
 
-    private final Topology<T> rt;
-
-    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();
 }