From: adam <adam@megacz.com>
Date: Mon, 19 Dec 2005 07:02:44 +0000 (-0500)
Subject: checkpoint
X-Git-Tag: tag_for_25-Mar~514
X-Git-Url: http://git.megacz.com/?p=sbp.git;a=commitdiff_plain;h=773d7aff52fe6678ba4e564de0bea9c4b8435e11;hp=3e081692a4a7f1a3333f8846a525f71c4543922e

checkpoint

darcs-hash:20051219070244-5007d-acdb5ea1bcc2eeb888c1970cf9c7d80303ca3bba.gz
---

diff --git a/src/edu/berkeley/sbp/misc/MetaGrammar.java b/src/edu/berkeley/sbp/misc/MetaGrammar.java
index 937a9f7..2ec3f45 100644
--- a/src/edu/berkeley/sbp/misc/MetaGrammar.java
+++ b/src/edu/berkeley/sbp/misc/MetaGrammar.java
@@ -54,7 +54,6 @@ public class MetaGrammar extends ReflectiveWalker {
 
     public PreSequence _amp_(PreSequence p, Object[] o)        { return p.and(new PreSequence(o, null).buildSequence(null, true, false, true)); }
     public PreSequence _amp__tilde_(PreSequence p, Object[] o) { return p.not(new PreSequence(o, null).buildSequence(null, true, false, true)); }
-    public Object      _star_(Element r)                                              { return Repeat.many0(r); }
     public Element     epsilon(Object o, Object b)                                    { return Union.epsilon; }
     public Object      _leftparen__rightparen_(Object o)                              { return Union.epsilon; }
     public Element     _rightparen_(Object e)                                         { return SELF; }
@@ -99,7 +98,6 @@ public class MetaGrammar extends ReflectiveWalker {
                            false);
     }
 
-    public Object   _plus_(final Element r)                    { return Repeat.many1(r); }
     public PreSequence rewrite(Object[] o)                     { return new PreSequence(o, null); }
 
     public PreSequence seqx(PreSequence p, String tag) { return _equals__greater_(p, tag); }
@@ -111,17 +109,20 @@ public class MetaGrammar extends ReflectiveWalker {
     public PreSequence ps(Object[] o) { return new PreSequence(o); }
     public PreSequence _slash_(PreSequence p, Object sep) { return p.sparse(sep); }
 
+    public Object      _star_(Element r)                    { return Repeat.many0(r); }
+    public Object   _plus_(final Element r)                 { return Repeat.many1(r); }
     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 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; }
     public MetaGrammar grammar(Object o, Union[] u, Object x) { return this; }
     public char    _backslash_n() { return '\n'; }
     public char    _backslash_r() { return '\r'; }
-    public Object    literal(String s) { return new MyDrop(string(s)); }
+    public Element    literal(String s) { Element ret = string(s); dropAll.add(ret); return ret; }
     public Range     _minus_(char a, char b) { return new Range(a, b); }
     public Range     range(char a)         { return new Range(a, a); }
     public Element   _leftbracket_       (Range[] rr) { return ranges(true, rr); }