X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FAtom.java;h=6c7a25ee59c02ad74a4f44658c71fd8a7f7c9e11;hb=03f91bd299c8c8724fe966f527b7410d2cea675d;hp=aac834bfa112991f203fb73670f89b54915e5941;hpb=96a2822a729e563a64173f22dc184bc972a200ef;p=sbp.git

diff --git a/src/edu/berkeley/sbp/Atom.java b/src/edu/berkeley/sbp/Atom.java
index aac834b..6c7a25e 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,17 @@ 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(); }
-    }
-    
-    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; }
+    /** 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;
+        for(Sequence s : (Union)e)
+            ret = ret==null ? toAtom(s) : ret.union(s.toAtom());
+        return ret;
     }
-    
 }