X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FAtom.java;h=cb7a379fd4748eaf9532c6eb804b4c75bc0d7d81;hb=cbf78b1b452c393c8c76c91fa6515c64525b56d8;hp=3b7ce1fa558692f388fc21ed6fd89f6587591eed;hpb=6b53048f4413f3c618acc3581d0b4f60a236a9bc;p=sbp.git

diff --git a/src/edu/berkeley/sbp/Atom.java b/src/edu/berkeley/sbp/Atom.java
index 3b7ce1f..cb7a379 100644
--- a/src/edu/berkeley/sbp/Atom.java
+++ b/src/edu/berkeley/sbp/Atom.java
@@ -8,24 +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 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; }
 
-    /** equality is based on the underlying <tt>Topology</tt> */
-    public int hashCode() { return top().hashCode(); }
-    
-    /** equality is based on the underlying <tt>Topology</tt> */
-    public boolean equals(Object o) { return o != null && o instanceof Atom && ((Atom)o).top().equals(top()); }
-
-    /** declared abstract to force subclasses to override it in a useful manner */
-    public abstract String toString();
-
     // Topology Thunks //////////////////////////////////////////////////////////////////////////////
 
-    public Topology<T>       unwrap() { return top().unwrap(); }
+    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); }
@@ -34,22 +26,23 @@ public abstract class Atom<T extends Token> extends Element implements Topology<
     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 class Infer<T extends Token> extends Atom<T> {
+    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>)e.toAtom(); }
-        public String toString() { return e.toString(); }
+        public String toString() { return e.toString(); /* FIXME should be toAtom() */ }
     }
     
-    public static class Invert<T extends Token> extends Atom<T> {
+    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; }
     }
-    
 }