checkpoint

[sbp.git] / src / edu / berkeley / sbp / misc / MetaGrammar.java

diff --git a/src/edu/berkeley/sbp/misc/MetaGrammar.java b/src/edu/berkeley/sbp/misc/MetaGrammar.java
index 71782dd..d385a55 100644 (file)
--- a/src/edu/berkeley/sbp/misc/MetaGrammar.java
+++ b/src/edu/berkeley/sbp/misc/MetaGrammar.java
@@ -82,13 +82,24 @@ public class MetaGrammar extends ReflectiveWalker {
     }
 
     public Object   _backslash__leftbrace_(String s)      { return SELF; }
-    public Object   _leftbrace_(String s)                 { return SELF; }
-    public Object   _plus_(final Element r) { return Repeat.many1(r); }
+    public Object   _leftbrace_(PreSequence p) {
+        return nonTerminal("braced"+(anon++),
+                           new PreSequence[][] {
+                               new PreSequence[] {
+                                   new PreSequence(CharToken.leftBrace),
+                                   p,
+                                   new PreSequence(CharToken.rightBrace)
+                               }
+                           },
+                           false,
+                           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   _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 PreSequence seq(Object[] o, Object sep, String tag) { return new PreSequence(sep==null ? o : _slash_(o, sep), tag); }
-    public Object[] seq(Object[] o) { return o; }
+    public Object[] seq(Object[] o)                            { return o; }
     public Object[] _slash_(Object[] o, Object sep) {
         if (o.length <= 1) return o;
         Object[] ret = new Object[o.length * 2 - 1];
@@ -141,6 +152,8 @@ public class MetaGrammar extends ReflectiveWalker {
         public /*final*/ String tag;
         public final Object[] o;
 
+        public PreSequence(Object o) { this(new Object[] { o }, null); }
+        public PreSequence(Object[] o) { this(o, null); }
         public PreSequence(Object[] o, String tag) { this.o = o; this.tag = tag; }
         boolean[] drops = null;
         public Union    buildUnion() {