checkpoint

darcs-hash:20051219082926-5007d-0a9d8294b1b330c57ddba6e21182fb943f1dd160.gz

diff --git a/src/edu/berkeley/sbp/misc/MetaGrammar.java b/src/edu/berkeley/sbp/misc/MetaGrammar.java
index 092710b..f8c40ba 100644 (file)
--- a/src/edu/berkeley/sbp/misc/MetaGrammar.java
+++ b/src/edu/berkeley/sbp/misc/MetaGrammar.java
@@ -15,7 +15,6 @@ public class MetaGrammar extends ReflectiveWalker {
         return ret.toString();
     }
 
         return ret.toString();
     }
 

-    // FIXME

     private static HashSet<Element> dropAll = new HashSet<Element>();
 
     // Statics //////////////////////////////////////////////////////////////////////////////
     private static HashSet<Element> dropAll = new HashSet<Element>();
 
     // Statics //////////////////////////////////////////////////////////////////////////////

@@ -60,7 +59,6 @@ public class MetaGrammar extends ReflectiveWalker {
     public Union       nonTerminal(String s)                                          { return nonTerminal(s, null, false, false); }
     public Union       _colon__colon__equals_(String s, PreSequence[][] p)            { return nonTerminal(s, p, false, false); }
     public Union       _bang__colon__colon__equals_(String s, PreSequence[][] p)      { return nonTerminal(s, p, false, true); }
     public Union       nonTerminal(String s)                                          { return nonTerminal(s, null, false, false); }
     public Union       _colon__colon__equals_(String s, PreSequence[][] p)            { return nonTerminal(s, p, false, false); }
     public Union       _bang__colon__colon__equals_(String s, PreSequence[][] p)      { return nonTerminal(s, p, false, true); }

-    public Union       _colon__colon__equals_(boolean q, String s, PreSequence[][] p) { return nonTerminal(s, p, false, q); }

     public Object      _leftparen_(PreSequence[][] p)                                 { return nonTerminal("anon"+(anon++), p, false, false); }
     public Union       nonTerminal(String str, PreSequence[][] s, boolean synthetic, boolean dropAll) {
         Union n = str.equals(startSymbol) ? g : nt.get(str);
     public Object      _leftparen_(PreSequence[][] p)                                 { return nonTerminal("anon"+(anon++), p, false, false); }
     public Union       nonTerminal(String str, PreSequence[][] s, boolean synthetic, boolean dropAll) {
         Union n = str.equals(startSymbol) ? g : nt.get(str);

@@ -110,9 +108,7 @@ public class MetaGrammar extends ReflectiveWalker {
         if (o2==null) o2 = new Object[0];
         Object[] o3 = new Object[o1.length + o2.length + 1];
         System.arraycopy(o1, 0, o3, 0, o1.length);
         if (o2==null) o2 = new Object[0];
         Object[] o3 = new Object[o1.length + o2.length + 1];
         System.arraycopy(o1, 0, o3, 0, o1.length);

-        Element es = string(s);
-        //dropAll.add(es);
-        o3[o1.length] = es;
+        o3[o1.length] = string(s);

         System.arraycopy(o2, 0, o3, o1.length+1, o2.length);
         PreSequence ret = new PreSequence(o3, s);
         ret.drops[o1.length] = o3.length>1;
         System.arraycopy(o2, 0, o3, o1.length+1, o2.length);
         PreSequence ret = new PreSequence(o3, s);
         ret.drops[o1.length] = o3.length>1;