From: adam <adam@megacz.com>
Date: Wed, 14 Dec 2005 07:27:27 +0000 (-0500)
Subject: checkpoint
X-Git-Tag: tag_for_25-Mar~539
X-Git-Url: http://git.megacz.com/?p=sbp.git;a=commitdiff_plain;h=cb5151d11037144c14809f6516ce5c1f1976ef7f;hp=856f6a1959a029b45687ad71eeb0ec3a99e112eb;ds=sidebyside

checkpoint

darcs-hash:20051214072727-5007d-2bc25b6907987df363a5c8a0ac3e1f5538c9126b.gz
---

diff --git a/src/edu/berkeley/sbp/misc/MetaGrammar.java b/src/edu/berkeley/sbp/misc/MetaGrammar.java
index ff0ef4b..cb67cba 100644
--- a/src/edu/berkeley/sbp/misc/MetaGrammar.java
+++ b/src/edu/berkeley/sbp/misc/MetaGrammar.java
@@ -50,8 +50,6 @@ public class MetaGrammar extends ReflectiveWalker {
 
     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 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; }
@@ -87,6 +85,8 @@ public class MetaGrammar extends ReflectiveWalker {
     public Object   _leftbrace_(String s)                 { return SELF; }
     public Object   _plus_(final Element r) { return Repeat.many1(r); }
 
+    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[] seq(Object[] o) { return o; }
     public Object[] _slash_(Object[] o, Object sep) {
         if (o.length <= 1) return o;
diff --git a/tests/meta.g b/tests/meta.g
index 85e9e25..fa2b98f 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -17,9 +17,8 @@ conjuncts   ::=  rewrite
               |  rewrite ^"&"  e*/ws   /ws
               |  rewrite ^"&~" e*/ws   /ws
 
-rewrite  ::=  sequence                  /ws        => "rewrite"
-           |  sequence ^"=>" word       /ws
-           |  sequence ^"=>" quoted     /ws
+rewrite  ::=  sequence                     /ws        => "rewrite"
+           |  sequence ^"=>" (word|quoted) /ws
 
 ec       ::= [~\-\]\\\~]
            | escaped