X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FSequence.java;h=44b30c572bacbedd2c5257abbb29bfb26f696db3;hp=28f656470cf8d46efb8d198ff2682ef157e3ee7e;hb=6af13e9dda011e2416e4f0ee3cc347e8e7fcafd7;hpb=ae0cef03f2e46f6ae6438f9a3e60ca36ff1a4643

diff --git a/src/edu/berkeley/sbp/Sequence.java b/src/edu/berkeley/sbp/Sequence.java
index 28f6564..44b30c5 100644
--- a/src/edu/berkeley/sbp/Sequence.java
+++ b/src/edu/berkeley/sbp/Sequence.java
@@ -18,7 +18,6 @@ public abstract class Sequence extends Element implements Iterable<Element> {
         for(Sequence s : needs) { ret.needs.add(s); s.needed.add(ret); }
         for(Sequence s : hates) { ret.hates.add(s); s.hated.add(ret); }
         ret.follow = follow;
-        ret.lame = lame;
         return ret;
     }
 
@@ -26,7 +25,7 @@ public abstract class Sequence extends Element implements Iterable<Element> {
     public static final Sequence empty = new Sequence.Constant.Empty();
 
     /** after matching the sequence, do not add anything to the output tree */
-    public static Sequence drop(Element[] e, boolean lame) { return new Constant.Drop(e, lame); }
+    public static Sequence drop(Element[] e) { return new Constant.Drop(e); }
 
     /** after matching the sequence, insert a constant into the output tree */
     public static Sequence constant(Element[] e, Object o) { return new Constant(e, o); }
@@ -65,7 +64,6 @@ public abstract class Sequence extends Element implements Iterable<Element> {
     final HashSet<Sequence> hated  = new HashSet<Sequence>();
     final HashSet<Sequence> needs  = new HashSet<Sequence>();
     final HashSet<Sequence> hates  = new HashSet<Sequence>();
-    public boolean           lame  = false;
 
     final Position          firstp;
     Position firstp() { return firstp; }
@@ -184,15 +182,12 @@ public abstract class Sequence extends Element implements Iterable<Element> {
             return (Forest<T>)Forest.create(loc, result, null, false);
         }
         static class Drop extends Constant {
-            Sequence _clone() { return new Drop(elements, lame); }
-            public Drop(Element[] e, boolean lame) {
-                super(e, null);
-                this.lame = lame;
-            }
+            Sequence _clone() { return new Drop(elements); }
+            public Drop(Element[] e) { super(e, null); }
         }
         static class Empty extends Sequence.Constant.Drop {
             Sequence _clone() { return new Empty(); }
-            public Empty() { super(new Element[] { }, false); } }
+            public Empty() { super(new Element[] { }); } }
     }
 
     static class Singleton extends Sequence {