X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FAtom.java;h=e02b79f816c0a95039abcf9e67206563cb3e5e4c;hb=6ff6d681e214e91ca3fa5afdff60a0fb88227404;hp=8c702a14c99f6a302f4c60f279ba88a220e65574;hpb=d3a56050406bda802d0dc4b3c24f83cbb0c06620;p=sbp.git

diff --git a/src/edu/berkeley/sbp/Atom.java b/src/edu/berkeley/sbp/Atom.java
index 8c702a1..e02b79f 100644
--- a/src/edu/berkeley/sbp/Atom.java
+++ b/src/edu/berkeley/sbp/Atom.java
@@ -1,3 +1,5 @@
+// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license
+
 package edu.berkeley.sbp;
 import java.io.*;
 import java.util.*;
@@ -7,41 +9,25 @@ 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 Token> extends Element implements Topology<T> {
-
-    private final Topology<T> rt;
-
-    public Atom(Topology<T> rt) { this.rt = rt; }
-
-    Topology<T> top() { return rt; }
-
-    void reachable(HashSet<Sequence.Position> h) { /* do-nothing */ }
+/**
+ *  <font color=green>an element which matches some set of one-token-long input strings</font>.
+ *
+ *  <p>
+ *  This class is a topology over itself (yes, that's sort of <a
+ *  href=http://en.wikipedia.org/wiki/Frege>Frege'd</a> up) so that
+ *  Atoms can be intersected and unioned with each other to result in
+ *  other Atom<Token>'s (rather than raw Topology<Token>'s, which are
+ *  not Elements).  If you want the latter, use the getTokenTopology()
+ *  method.
+ *  </p>
+ */
+public abstract class Atom<Token> extends Element implements Topology<Atom<Token>> {
+
+    /** the set (topology) of tokens that can match this element */
+    public abstract Topology<Token>  getTokenTopology();
+
+    StringBuffer toString(StringBuffer sb) { sb.append(this); return sb; }
 
-    /** equality is based on the underlying <tt>Topology</tt> */
-    public int hashCode() { return rt.hashCode(); }
-    
-    /** equality is based on the underlying <tt>Topology</tt> */
-    public boolean equals(Object o) { return o != null && o instanceof Atom && ((Atom)o).rt.equals(rt); }
-
-    /** declared abstract to force subclasses to override it in a useful manner */
-    public abstract String toString();
-
-    // Topology Thunks //////////////////////////////////////////////////////////////////////////////
-
-    public void              add(Topology<T> t)         { rt.add(t); }
-    public void              add(T t)                   { rt.add(t); }
-    public void              remove(Topology<T> t)      { rt.remove(t); }
-    public void              remove(T t)                { rt.remove(t); }
-    public Topology<T>       dup()                      { return rt.dup(); }
-    public boolean           contains(T v)              { return rt.contains(v); }
-    public Topology<T>       fresh()                    { return rt.fresh(); }
-    public Topology<T>       intersect(Topology<T> t)   { return rt.intersect(t); }
-    public Topology<T>       minus(Topology<T> t)       { return rt.minus(t); }
-    public Topology<T>       union(Topology<T> t)       { return rt.union(t); }
-    public Topology<T>       complement()               { return rt.complement(); }
-    public boolean           disjoint(Topology<T> t)    { return rt.disjoint(t); }
-    public boolean           containsAll(Topology<T> t) { return rt.containsAll(t); }
-    
 }
 
+