X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FAtom.java;h=306e126e0e49a2f69561452ae038a8d77bc03c37;hp=32e7f0f65917fe9c406dd7e166b969f938112c75;hb=b320f26b6e2cc13dcfcd810c7d5b507b942e8c70;hpb=fa858dc4acddd3e32126ff2558e0860315a84758

diff --git a/src/edu/berkeley/sbp/Atom.java b/src/edu/berkeley/sbp/Atom.java
index 32e7f0f..306e126 100644
--- a/src/edu/berkeley/sbp/Atom.java
+++ b/src/edu/berkeley/sbp/Atom.java
@@ -7,37 +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 Element implements Topology<T> {
+/** <font color=green>an element which matches exactly one input token</font> */
+public abstract class Atom<T> extends Element implements Topology<Atom<T>> {
 
-    protected abstract Topology<T> top();
-    public    abstract String toString();
-    public             StringBuffer toString(StringBuffer sb) { sb.append(this); return sb; }
+    public  abstract Topology<T>  underlying();
+    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()); }
-
-    // Subclasses //////////////////////////////////////////////////////////////////////////////
-
-    
-    public static Topology toAtom(Element e) {
-        if (e instanceof Atom) return (Atom)e;
-        if (e instanceof Sequence) return ((Sequence)e).toAtom();
-        Topology ret = null;
-        for(Sequence s : (Union)e)
-            ret = ret==null ? toAtom(s) : ret.union(s.toAtom());
-        return ret;
-    }
 }