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

diff --git a/src/edu/berkeley/sbp/Atom.java b/src/edu/berkeley/sbp/Atom.java
index 0722d0b..037dfaa 100644
--- a/src/edu/berkeley/sbp/Atom.java
+++ b/src/edu/berkeley/sbp/Atom.java
@@ -8,16 +8,16 @@ 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 {
+public abstract class Atom<T extends Token> extends Element implements Topology<T> {
 
     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 */ }
 
+    public Topology toAtom() { return dup(); }
+
     /** equality is based on the underlying <tt>Topology</tt> */
     public int hashCode() { return rt.hashCode(); }
     
@@ -26,5 +26,22 @@ public abstract class Atom<T extends Token> extends Element {
 
     /** declared abstract to force subclasses to override it in a useful manner */
     public abstract String toString();
+
+    // Topology Thunks //////////////////////////////////////////////////////////////////////////////
+
+    public void              add(Topology<T> t)         { rt.add(t); }
+    public void              add(T t)                   { rt.add(t); }
+    public void              remove(Topology<T> t)      { rt.remove(t); }
+    public void              remove(T t)                { rt.remove(t); }
+    public Topology<T>       dup()                      { return rt.dup(); }
+    public boolean           contains(T v)              { return rt.contains(v); }
+    public Topology<T>       fresh()                    { return rt.fresh(); }
+    public Topology<T>       intersect(Topology<T> t)   { return rt.intersect(t); }
+    public Topology<T>       minus(Topology<T> t)       { return rt.minus(t); }
+    public Topology<T>       union(Topology<T> t)       { return rt.union(t); }
+    public Topology<T>       complement()               { return rt.complement(); }
+    public boolean           disjoint(Topology<T> t)    { return rt.disjoint(t); }
+    public boolean           containsAll(Topology<T> t) { return rt.containsAll(t); }
+    
 }