X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FAtom.java;h=32e7f0f65917fe9c406dd7e166b969f938112c75;hp=a5f7e87078f2392228a72aa8d2a11feb2518d021;hb=fa858dc4acddd3e32126ff2558e0860315a84758;hpb=1a249057cbfd2180910e46672eafee3af46ae470 diff --git a/src/edu/berkeley/sbp/Atom.java b/src/edu/berkeley/sbp/Atom.java index a5f7e87..32e7f0f 100644 --- a/src/edu/berkeley/sbp/Atom.java +++ b/src/edu/berkeley/sbp/Atom.java @@ -12,6 +12,7 @@ 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; } // Topology Thunks ////////////////////////////////////////////////////////////////////////////// @@ -29,21 +30,8 @@ public abstract class Atom extends Element implements Topology { // Subclasses ////////////////////////////////////////////////////////////////////////////// - public static class Infer extends Atom { - private final Element e; - public Infer(Element e) { this.e = e; } - public Topology top() { return (Topology)toAtom(e); } - public String toString() { return e.toString(); /* FIXME should be toAtom() */ } - } - public static class Invert extends Atom { - private final Atom a; - public Invert(Atom a) { this.a = a; } - public Topology top() { return ((Topology)a.top()).complement(); } - public String toString() { return "~"+a; } - } - - static Topology toAtom(Element e) { + public static Topology toAtom(Element e) { if (e instanceof Atom) return (Atom)e; if (e instanceof Sequence) return ((Sequence)e).toAtom(); Topology ret = null;