checkpoint

darcs-hash:20051219070400-5007d-0423e079656ef1aa811dc176f574acde2b790e40.gz

diff --git a/src/edu/berkeley/sbp/misc/MetaGrammar.java b/src/edu/berkeley/sbp/misc/MetaGrammar.java
index 2ec3f45..1a79a1d 100644 (file)
--- a/src/edu/berkeley/sbp/misc/MetaGrammar.java
+++ b/src/edu/berkeley/sbp/misc/MetaGrammar.java
@@ -140,10 +140,6 @@ public class MetaGrammar extends ReflectiveWalker {
         public final String s;
         public MyLift(String s) { this.s = s; }
     }
         public final String s;
         public MyLift(String s) { this.s = s; }
     }

-    public class MyDrop {
-        public final Object o;
-        public MyDrop(Object o) { this.o = o; }
-    }

 
     public class PreSequence {
         public final HashSet<Sequence> and  = new HashSet<Sequence>();
 
     public class PreSequence {
         public final HashSet<Sequence> and  = new HashSet<Sequence>();

@@ -206,8 +202,6 @@ public class MetaGrammar extends ReflectiveWalker {
                 int j = 0;
                 for(int i=0; i<o.length; i++) {
                     Object oi = o[i];
                 int j = 0;
                 for(int i=0; i<o.length; i++) {
                     Object oi = o[i];

-                    if (oi instanceof MyDrop)      { oi = ((MyDrop)oi).o; drops[j] = true; }
-

                     if (oi==SELF)                    o2[j] = u.new Subset("(("+u+"))", set);
                     else if (oi instanceof MyLift) { o2[j] = string(tag = ((MyLift)oi).s); drops[j] = o.length>1; }
                     else                             o2[j] = (Element)oi;
                     if (oi==SELF)                    o2[j] = u.new Subset("(("+u+"))", set);
                     else if (oi instanceof MyLift) { o2[j] = string(tag = ((MyLift)oi).s); drops[j] = o.length>1; }
                     else                             o2[j] = (Element)oi;