X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FRepeat.java;h=037e67d58b06571328e674d05eb0cbe2cd8fbacb;hp=89199c5e55dfeeaa9a7b33ff896a280121b885f9;hb=b8a597c8d1a29afc24f9b89f726d5b1a9b9aeec1;hpb=74e53cbf7227f5958ff7495abe31cb0462d62c4e

diff --git a/src/edu/berkeley/sbp/Repeat.java b/src/edu/berkeley/sbp/Repeat.java
index 89199c5..037e67d 100644
--- a/src/edu/berkeley/sbp/Repeat.java
+++ b/src/edu/berkeley/sbp/Repeat.java
@@ -23,6 +23,7 @@ class Repeat extends Union {
         }
         if (zeroOkay) {
             add(new Sequence.RewritingSequence(tag, new Element[] { }, null));
+            //add(new Sequence.Constant.Empty());
             // FUGLY
             add(new Sequence.Singleton(Sequence.many1(e, separator, tag)));
         } else {
@@ -40,21 +41,13 @@ class Repeat extends Union {
             if (zeroOkay && separator != null)
                 throw new RuntimeException("cannot create a maximal repetition of zero or more items with a separator (yet): " + this);
             for(Sequence s : this)
-                s.follow = new Invert(separator);
+                s.follow = (Atom)separator.complement();
         }
         public Maximal(final Atom e, boolean zeroOkay, boolean manyOkay, Object tag) {
             super(e, zeroOkay, manyOkay, null, true, tag);
             for(Sequence s : this)
-                s.follow = new Invert(e);
+                s.follow = (Atom)e.complement();
         }
     }
 
-
-    /** an atom which tracks the inverse of some other atom */
-    private 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 a.complement(); }
-        public String toString() { return "~"+a; }
-    }
 }