X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fedu%2Fberkeley%2Fsbp%2FAtom.java;h=98726c1c4a6cf855fd5d0d33c029d86c15ccc0c3;hb=ae0cef03f2e46f6ae6438f9a3e60ca36ff1a4643;hp=f5b0158f603f63ce7907361287419fd174f1e3ee;hpb=b0d313eb49712b23f9c71003c96f130f23a63526;p=sbp.git

diff --git a/src/edu/berkeley/sbp/Atom.java b/src/edu/berkeley/sbp/Atom.java
index f5b0158..98726c1 100644
--- a/src/edu/berkeley/sbp/Atom.java
+++ b/src/edu/berkeley/sbp/Atom.java
@@ -8,12 +8,11 @@ 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 implements Topology<T> {
+public abstract class Atom<T> extends Element implements Topology<T> {
 
     protected abstract Topology<T> top();
-    public    abstract String toString();
-
-    public Topology toAtom() { return this; }
+    public    abstract String       toString();
+    public             StringBuffer toString(StringBuffer sb) { sb.append(this); return sb; }
 
     // Topology Thunks //////////////////////////////////////////////////////////////////////////////
 
@@ -29,21 +28,5 @@ public abstract class Atom<T extends Token> extends Element implements Topology<
     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 Token> extends Atom<T> {
-        private final Element e;
-        public Infer(Element e) { this.e = e; }
-        public Topology<T> top() { return (Topology<T>)e.toAtom(); }
-        public String toString() { return e.toString(); /* FIXME should be toAtom() */ }
-    }
-    
-    public static class Invert<T extends Token> 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; }
-    }
-    
 }