checkpoint

darcs-hash:20051214064253-5007d-bf247bec6a35cd23a3a2776d5a3696e1b9153a87.gz

diff --git a/src/edu/berkeley/sbp/misc/MetaGrammar.java b/src/edu/berkeley/sbp/misc/MetaGrammar.java
index eb061d0..234673f 100644 (file)
--- a/src/edu/berkeley/sbp/misc/MetaGrammar.java
+++ b/src/edu/berkeley/sbp/misc/MetaGrammar.java
@@ -28,9 +28,6 @@ public class MetaGrammar extends ReflectiveWalker {
     // MetaGrammar //////////////////////////////////////////////////////////////////////////////
 
     public Object      _star_(Element r)                                              { return new Rep(r, null, false, true); }
     // MetaGrammar //////////////////////////////////////////////////////////////////////////////
 
     public Object      _star_(Element r)                                              { return new Rep(r, null, false, true); }

-    public Union       _colon__colon__equals_(String s, PreSequence[][] p)            { return nonTerminalZ(s, p); }
-    public Union       _bang__colon__colon__equals_(String s, PreSequence[][] p)      { return nonTerminalZ(s, p, true); }
-    public Union       _colon__colon__equals_(boolean q, String s, PreSequence[][] p) { return nonTerminalZ(s, p, q); }

     public Element     epsilon(Object o, Object b)                                    { return epsilon; }
     public Element     _rightparen_(Object e)                                         { return SELF; }
 
     public Element     epsilon(Object o, Object b)                                    { return epsilon; }
     public Element     _rightparen_(Object e)                                         { return SELF; }
 

@@ -42,7 +39,6 @@ public class MetaGrammar extends ReflectiveWalker {
     public Object      _caret_(String s)                       { return new MyLift(s); }
     public Object      _leftparen__rightparen_()               { return epsilon; }
         
     public Object      _caret_(String s)                       { return new MyLift(s); }
     public Object      _leftparen__rightparen_()               { return epsilon; }
         

-    public Object      _leftparen_(PreSequence[][] p) { return nonTerminalZ(p); }

     public Union       nonTerminal(String s) { return nonTerminalX(s, false, false); }
     public Union nonTerminalX(String s, boolean synthetic, boolean dropAll) {
         Union n = s.equals(startSymbol) ? g : nt.get(s);
     public Union       nonTerminal(String s) { return nonTerminalX(s, false, false); }
     public Union nonTerminalX(String s, boolean synthetic, boolean dropAll) {
         Union n = s.equals(startSymbol) ? g : nt.get(s);

@@ -50,12 +46,13 @@ public class MetaGrammar extends ReflectiveWalker {
         if (dropAll) this.dropAll.add(n);
         return n;
     }
         if (dropAll) this.dropAll.add(n);
         return n;
     }

-    public Union       nonTerminalZ(PreSequence[][] p)           { return nonTerminalX("anon"+(anon++), p, false, false); }
-    public Union       nonTerminalZ(String s, PreSequence[][] p) { return nonTerminalX(s, p, false, false); }
-    public Union       nonTerminalZ(String s, PreSequence[][] p, boolean q) { return nonTerminalX(s, p, false, q); }
-    public Object  _backslash__leftbrace_(String s)      { return SELF; }
-    public Object  _leftbrace_(String s)                 { return SELF; }
-    public Object _plus_(final Element r) { return new Rep(r, null, false, false); }
+    public Union       _colon__colon__equals_(String s, PreSequence[][] p)            { return nonTerminalX(s, p, false, false); }
+    public Union       _bang__colon__colon__equals_(String s, PreSequence[][] p)      { return nonTerminalX(s, p, false, true); }
+    public Union       _colon__colon__equals_(boolean q, String s, PreSequence[][] p) { return nonTerminalX(s, p, false, q); }
+    public Object      _leftparen_(PreSequence[][] p) { return nonTerminalX("anon"+(anon++), p, false, false); }
+    public Object   _backslash__leftbrace_(String s)      { return SELF; }
+    public Object   _leftbrace_(String s)                 { return SELF; }
+    public Object   _plus_(final Element r) { return new Rep(r, null, false, false); }

     public Object[] _slash_(Object[] o, Object sep) {
         if (o.length <= 1) return o;
         Object[] ret = new Object[o.length * 2 - 1];
     public Object[] _slash_(Object[] o, Object sep) {
         if (o.length <= 1) return o;
         Object[] ret = new Object[o.length * 2 - 1];