checkpoint

[sbp.git] / src / edu / berkeley / sbp / misc / MetaGrammar.java

diff --git a/src/edu/berkeley/sbp/misc/MetaGrammar.java b/src/edu/berkeley/sbp/misc/MetaGrammar.java
index d6e8a88..d160680 100644 (file)
--- a/src/edu/berkeley/sbp/misc/MetaGrammar.java
+++ b/src/edu/berkeley/sbp/misc/MetaGrammar.java
@@ -27,7 +27,8 @@ public class MetaGrammar extends ReflectiveWalker {
 
     // MetaGrammar //////////////////////////////////////////////////////////////////////////////
 
-    public Object      _star_(Element r)                                              { return rep(r, null, false, true); }
+    public PreSequence _equals__greater_(Object[] o, String s) { return new PreSequence(o, s); }
+    public Object      _star_(Element r)                                              { return Repeat.many0(r); }
     public Element     epsilon(Object o, Object b)                                    { return epsilon; }
     public Element     _rightparen_(Object e)                                         { return SELF; }
 
@@ -67,7 +68,7 @@ public class MetaGrammar extends ReflectiveWalker {
 
     public Object   _backslash__leftbrace_(String s)      { return SELF; }
     public Object   _leftbrace_(String s)                 { return SELF; }
-    public Object   _plus_(final Element r) { return rep(r, null, false, false); }
+    public Object   _plus_(final Element r) { return Repeat.many1(r); }
     public Object[] _slash_(Object[] o, Object sep) {
         if (o.length <= 1) return o;
         Object[] ret = new Object[o.length * 2 - 1];
@@ -78,10 +79,11 @@ public class MetaGrammar extends ReflectiveWalker {
         }
         return ret;
     }
-    public Object _plus__slash_(final Element r, Object s) { return rep(r, (Element)s, false, false); }
-    public Object _star__slash_(final Element r, Object s) { return rep(r, (Element)s, false, true); }
-    public Object _star__star_(final Element r) { return rep(r, null, true, true); }
-    public Object _plus__plus_(final Element r) { return rep(r, null, true, false); }
+
+    public Object _plus__slash_(final Element r, Element s) { return Repeat.many1(r, s); }
+    public Object _star__slash_(final Element r, Element s) { return Repeat.many0(r, s); }
+    public Object _star__star_(final Element r) { return Repeat.maximal(Repeat.many0(r)); }
+    public Object _plus__plus_(final Element r) { return Repeat.maximal(Repeat.many1(r)); }
     public Element _question_(final Element r) { return Repeat.maybe(r); }
     public MetaGrammar gram(Object o, MetaGrammar g, Object o2) { return g; }
     public MetaGrammar  grammar(Object[] o) { return this; }
@@ -125,12 +127,9 @@ public class MetaGrammar extends ReflectiveWalker {
         return ret;
     }
 
-    public String stringify(String s) { return StringUtil.unescapify(s); }
-    public char unescape(char x, char c) { return unescape(c); }
-    public char unescape(char c) { return StringUtil.unescapify("\\"+c).charAt(0); }
     public PreSequence sequence(Object[] o) { return new PreSequence(o, null); }
 
-    public PreSequence _equals__greater_(Object[] o, String s) { return new PreSequence(o, s); }
+
     public PreSequence wrap(Object[] o) { return new PreSequence(o, ""); }
     public PreSequence mwrap(Object[] o) { return new PreSequence(o, ""); }
     public PreSequence rewrite(Object[] o) { return new PreSequence(o, null); }
@@ -140,16 +139,6 @@ public class MetaGrammar extends ReflectiveWalker {
         o3[o3.length-1] = o2;
         return rewrite(o3);
     }
-        
-    public static class PreBrace {
-        public final Object[] o;
-        public PreBrace(Object[] o) { this.o = o; }
-    }
-
-    public Element rep(Element e, Element sep, boolean maximal, boolean zero) {
-        Element ret = zero ? Repeat.many0(e, sep) :  Repeat.many1(e, sep);
-        return maximal ? Repeat.maximal(ret) : ret;
-    }
 
     public static class PreSequence {
         public PreSequence not(Sequence s) { not.add(s); return this; }