checkpoint

darcs-hash:20051222012810-5007d-6ad0b2cfa57240c899cc16a6caaa2c6b37f09add.gz

diff --git a/src/edu/berkeley/sbp/Tree.java b/src/edu/berkeley/sbp/Tree.java
index 989224c..c2216cc 100644 (file)
--- a/src/edu/berkeley/sbp/Tree.java
+++ b/src/edu/berkeley/sbp/Tree.java
@@ -16,6 +16,7 @@ public class Tree<T> {
     public T                 head()     { return head; }
     public int               numChildren() { return children.length; }
     public Iterable<Tree<T>> children() { return new ArrayIterator(children); }
+    public Tree<T>           child(int i) { return children[i]; }
 
     public       Token.Location    getLocation() { return location; }
 

diff --git a/src/edu/berkeley/sbp/misc/MetaGrammar.java b/src/edu/berkeley/sbp/misc/MetaGrammar.java
index e7aa685..5eeb4a5 100644 (file)
--- a/src/edu/berkeley/sbp/misc/MetaGrammar.java
+++ b/src/edu/berkeley/sbp/misc/MetaGrammar.java
@@ -111,25 +111,24 @@ public class MetaGrammar extends ReflectiveWalker {
     }
     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 walk(Tree<String> tree) {
         String head = tree.head();
         if (tree.numChildren()==0) return super.walk(tree);
         if      ("\\n".equals(head)) return new Character('\n');
         else if ("\\r".equals(head)) return new Character('\r');
         else if ("grammar".equals(head)) { for(Tree<String> t : tree.children()) walk(t); return this; }
+        else if ("*".equals(head))  return Repeat.many0((Element)walk(tree.child(0)));
+        else if ("+".equals(head))  return Repeat.many1((Element)walk(tree.child(0)));
+        else if ("+/".equals(head)) return Repeat.many1((Element)walk(tree.child(0)), (Element)walk(tree.child(1)));
+        else if ("*/".equals(head)) return Repeat.many0((Element)walk(tree.child(0)), (Element)walk(tree.child(1)));
+        else if ("**".equals(head)) return Repeat.maximal(Repeat.many0((Element)walk(tree.child(0))));
+        else if ("++".equals(head)) return Repeat.maximal(Repeat.many1((Element)walk(tree.child(0))));
+        else if ("?".equals(head))  return Repeat.maybe((Element)walk(tree.child(0)));
         else return super.walk(tree);
     }
 
-    public Object gram(Object o, Object g, Object o2) { return g; }
-    public Element    literal(String s) { Element ret = string(s); dropAll.add(ret); return ret; }
+    public Object    gram(Object o, Object g, Object o2) { return g; }
+    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); }