X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FAtom.java;h=55be283096ef76586322e63cff8d98b3e03ee535;hb=45d799349e635f1a99e3974e4504a43d5a7aaf33;hp=2589ddeabb9d435ff5e47a09531175b3d6a0d98f;hpb=b409afa0cf6d72a23703d9172812ab4fcd6a969b;p=sbp.git

diff --git a/src/edu/berkeley/sbp/Atom.java b/src/edu/berkeley/sbp/Atom.java
index 2589dde..55be283 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             StringBuffer toString(StringBuffer sb) { sb.append(this); return sb; }
 
     // Topology Thunks //////////////////////////////////////////////////////////////////////////////
 
@@ -31,28 +30,29 @@ public abstract class Atom<T extends Token> extends Element implements Topology<
 
     // Subclasses //////////////////////////////////////////////////////////////////////////////
 
-    public static class Infer<T extends Token> extends Atom<T> {
+    /** an atom which tracks the possible tokenset of some element, provided that element can only match single-token sequences */
+    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(); /* FIXME should be toAtom() */ }
+        public Topology<T> top() { return (Topology<T>)toAtom(e); }
+        public String toString() { return e.toString(); }
     }
     
-    public static class Invert<T extends Token> extends Atom<T> {
+    /** an atom which tracks the inverse of some other atom */
+    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; }
     }
-    
-    public static class Hack<T extends Token> extends Atom<T> {
-        private final Atom<T> a;
-        static final Topology leftright =
-            edu.berkeley.sbp.misc.CharToken.rightBrace.union(edu.berkeley.sbp.misc.CharToken.leftBrace);
-        public Hack(Atom<T> a) { this.a = a; }
-        public Topology<T> top() { return ((Topology<T>)a.top()).minus(leftright); }
-        public String toString() { return "~"+a; }
+
+    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;
     }
-    
 }