X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FMetaGrammar.java;h=d5fa65da448f43b973b82e93f2397c346829e70b;hp=d160680dc9dfcb58718b9bcf712f0a9edd36158b;hb=ea6309dcafef2c5796be4c1d50c8295274dc31d6;hpb=83de4a54d4e180843453a84daf7c6800fbc7edad

diff --git a/src/edu/berkeley/sbp/misc/MetaGrammar.java b/src/edu/berkeley/sbp/misc/MetaGrammar.java
index d160680..d5fa65d 100644
--- a/src/edu/berkeley/sbp/misc/MetaGrammar.java
+++ b/src/edu/berkeley/sbp/misc/MetaGrammar.java
@@ -25,21 +25,40 @@ public class MetaGrammar extends ReflectiveWalker {
     public static Union epsilon = new Union("()");
     static { epsilon.add(Sequence.empty); }
 
+    ////////////////////////////////////////////////////////////////////////////////
+
+    private Union g;
+    private HashMap<String,Union> nt;
+    private int anon = 0;
+    private Element dws;
+    private String startSymbol;
+
+    public MetaGrammar() { this("s"); }
+    public MetaGrammar(String s) { done(s); }
+    public Union done() { return done("s"); }
+    public Union done(String str) {
+        Union ret = g;
+        g = new Union(str);
+        startSymbol = str;
+        nt = new HashMap<String,Union>();
+        dropAll = new HashSet<Element>();
+        nt.put(str, g);
+        this.dws = Repeat.maximal(Repeat.many0(nonTerminal("w")));
+        return ret;
+    }
     // MetaGrammar //////////////////////////////////////////////////////////////////////////////
 
-    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; }
 
     public PreSequence _amp_(PreSequence p, Object[] o)        { return p.and(new PreSequence(o, null, true).buildSequence(null, true, false)); }
     public PreSequence _amp__tilde_(PreSequence p, Object[] o) { return p.not(new PreSequence(o, null, true).buildSequence(null, true, false)); }
-
-    public Element     _bang_(Element r)                       { return r; }
-    public Object      care(String s)                          { return new MyLift(s); }
-    public Object      _caret_(String s)                       { return new MyLift(s); }
-    public Object      _leftparen__rightparen_()               { return epsilon; }
-        
+    public PreSequence rewrite(Object[] o)                                            { return new PreSequence(o, null); }
+    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; }
+    public Element     _bang_(Element r)                                              { return r; }
+    public Object      _caret_(String s)                                              { return new MyLift(s); }
+    public Object      _leftparen__rightparen_()                                      { return epsilon; }
     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); }
@@ -104,40 +123,13 @@ public class MetaGrammar extends ReflectiveWalker {
         return CharToken.set(ret);
     }
 
-
-    ////////////////////////////////////////////////////////////////////////////////
-
-    private Union g;
-    private HashMap<String,Union> nt;
-    private int anon = 0;
-    private Element dws;
-    private String startSymbol;
-
-    public MetaGrammar() { this("s"); }
-    public MetaGrammar(String s) { done(s); }
-    public Union done() { return done("s"); }
-    public Union done(String str) {
-        Union ret = g;
-        g = new Union(str);
-        startSymbol = str;
-        nt = new HashMap<String,Union>();
-        dropAll = new HashSet<Element>();
-        nt.put(str, g);
-        this.dws = Repeat.maximal(Repeat.many0(nonTerminal("w")));
-        return ret;
+    public static class MyLift {
+        public final String s;
+        public MyLift(String s) { this.s = s; }
     }
-
-    public PreSequence sequence(Object[] o) { return new PreSequence(o, null); }
-
-
-    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); }
-    public PreSequence rewrite(Object[] o, Object o2) {
-        Object[] o3 = new Object[o.length + 1];
-        System.arraycopy(o, 0, o3, 0, o.length);
-        o3[o3.length-1] = o2;
-        return rewrite(o3);
+    public static class MyDrop {
+        public final Object o;
+        public MyDrop(Object o) { this.o = o; }
     }
 
     public static class PreSequence {
@@ -235,15 +227,6 @@ public class MetaGrammar extends ReflectiveWalker {
         os.close();
     }
 
-    public static class MyLift {
-        public final String s;
-        public MyLift(String s) { this.s = s; }
-    }
-    public static class MyDrop {
-        public final Object o;
-        public MyDrop(Object o) { this.o = o; }
-    }
-
     public static final Tree meta =