X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FAtom.java;h=6c7a25ee59c02ad74a4f44658c71fd8a7f7c9e11;hb=9b7ce1d3e4ac84ecd2d0f5f461b42c40f38e4783;hp=70c29049c6264e510b01c4e2480181a1ec89ef1a;hpb=5d18f5606c9296e6b0c5749f05fc68f358ace2f6;p=sbp.git

diff --git a/src/edu/berkeley/sbp/Atom.java b/src/edu/berkeley/sbp/Atom.java
index 70c2904..6c7a25e 100644
--- a/src/edu/berkeley/sbp/Atom.java
+++ b/src/edu/berkeley/sbp/Atom.java
@@ -11,7 +11,7 @@ import edu.berkeley.sbp.*;
 public abstract class Atom<T> extends Element implements Topology<T> {
 
     protected abstract Topology<T> top();
-    public    abstract String toString();
+    public    abstract String       toString();
     public             StringBuffer toString(StringBuffer sb) { sb.append(this); return sb; }
 
     // Topology Thunks //////////////////////////////////////////////////////////////////////////////
@@ -28,23 +28,11 @@ public abstract class Atom<T> extends Element implements Topology<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 class Infer<T extends Input> extends Atom<T> {
-        private final Element e;
-        public Infer(Element e) { this.e = e; }
-        public Topology<T> top() { return (Topology<T>)toAtom(e); }
-        public String toString() { return e.toString(); /* FIXME should be toAtom() */ }
-    }
-    
-    public static class Invert<T extends Input> extends Atom<T> {
-        private final Atom<T> a;
-        public Invert(Atom<T> a) { this.a = a; }
-        public Topology<T> top() { return ((Topology<T>)a.top()).complement(); }
-        public String toString() { return "~"+a; }
-    }
-
-    static Topology toAtom(Element e) {
+    /** if all expressions matching <tt>e</tt> are exactly one token
+     *  long, <b>attempt to</b> return an Atom representing that token
+     *  (undecidable in general; only works in trivial cases)
+     */
+    public static Topology toAtom(Element e) {
         if (e instanceof Atom) return (Atom)e;
         if (e instanceof Sequence) return ((Sequence)e).toAtom();
         Topology ret = null;