checkpoint

darcs-hash:20051213070431-5007d-7f5c8e6be6e105016c0f2176660f30db09541a3f.gz

diff --git a/src/edu/berkeley/sbp/misc/MetaGrammar.java b/src/edu/berkeley/sbp/misc/MetaGrammar.java
index 0f75ecd..627300d 100644 (file)
--- a/src/edu/berkeley/sbp/misc/MetaGrammar.java
+++ b/src/edu/berkeley/sbp/misc/MetaGrammar.java
@@ -93,7 +93,7 @@ public class MetaGrammar extends ReflectiveWalker {
         return new Rep(r, (Element)s, false, true);
     }
     //public Element _star__slash_(final Element r, Element s) { return Repeat.many0(r, s); }
-    //public Element _star__star_(final Element r, Element s) { return Repeat.maximal(Repeat.many0(r, s)); }
+    public Object _star__star_(final Element r) { return new Rep(r, null, true, true); }
     public Object _plus__plus_(final Element r) { return new Rep(r, null, true, false); }
         public Element _question_(final Element r) { return Repeat.maybe(r); }
         public MetaGrammar gram(Object o, MetaGrammar g, Object o2) { return g; }

diff --git a/tests/meta.g b/tests/meta.g
index 074b9f3..f16c60a 100644 (file)
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,5 +1,5 @@
 s         ::=  w* Grammar w*                  => "gram"
-ws       !::=  w*
+ws       !::=  w**
 grammar   ::=  R+/ws => "grammar"
 Grammar   ::=  R+ => "grammar"
 R         ::=  word  ^"::=" Alternatives
@@ -12,7 +12,7 @@ EquiAlt       ::=  Conjuncts +/ "|"                 => "alternatives"
 
 sequence    ::= Es ^"/" E   /ws
               > Es
-es ::= E+/ws
+Es ::= E+
 
 Conjuncts   ::=  rewrite
               |  rewrite ^"&"  sequence