X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=inline;f=src%2Fedu%2Fberkeley%2Fsbp%2FAtom.java;h=daa3d495e75c50a6dc04b6f31ccd7b23c1bc116e;hb=2c1c0293545f3d12c23220fd05c663e6aa3f3de1;hp=b9832b2d313c20a3ea314359a3d746ab91b83bbe;hpb=0e17670bcfa7b0fe8eb3a2cac81f4b080a09fc98;p=sbp.git
diff --git a/src/edu/berkeley/sbp/Atom.java b/src/edu/berkeley/sbp/Atom.java
index b9832b2..daa3d49 100644
--- a/src/edu/berkeley/sbp/Atom.java
+++ b/src/edu/berkeley/sbp/Atom.java
@@ -7,26 +7,24 @@ 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 extends Element implements Topology {
+/**
+ * an element which matches some set of one-token-long input strings.
+ *
+ *
+ * This class is a topology over itself (yes, that's sort of Frege'd
+ * up) so that Atoms can be intersected and unioned with each other
+ * to result in other Atom's (rather than raw Topology's, which
+ * are not Elements). If you want the latter, use the
+ * getTokenTopology() method.
+ *
+ */
+public abstract class Atom extends Element implements Topology> {
- protected abstract Topology top();
- public abstract String toString();
- public StringBuffer toString(StringBuffer sb) { sb.append(this); return sb; }
+ /** the set (topology) of tokens that can match this element */
+ public abstract Topology getTokenTopology();
- // Topology Thunks //////////////////////////////////////////////////////////////////////////////
-
- public Topology unwrap() { return top().unwrap(); }
- public Topology empty() { return top().empty(); }
- public boolean contains(T v) { return top().contains(v); }
- public Topology intersect(Topology t) { return top().intersect(t); }
- public Topology minus(Topology t) { return top().minus(t); }
- public Topology union(Topology t) { return top().union(t); }
- public Topology complement() { return top().complement(); }
- public boolean disjoint(Topology t) { return top().disjoint(t); }
- public boolean containsAll(Topology 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()); }
+ StringBuffer toString(StringBuffer sb) { sb.append(this); return sb; }
}
+