X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FMetaGrammar.java;h=4d8bfc5c9d1153347a3c5f62f2a1ae8b7745e69b;hp=9244f05a2c63c918cf96cbe7adc855e3a14eedd8;hb=5e8e3c98f80fd61cc4f427c4984cb497bab0f6fc;hpb=0a0227b9180534d2a431f3d6e08a398bde2244c4

diff --git a/src/edu/berkeley/sbp/misc/MetaGrammar.java b/src/edu/berkeley/sbp/misc/MetaGrammar.java
index 9244f05..4d8bfc5 100644
--- a/src/edu/berkeley/sbp/misc/MetaGrammar.java
+++ b/src/edu/berkeley/sbp/misc/MetaGrammar.java
@@ -72,8 +72,22 @@ 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 new Rep(r, null, false, false); }
+    public Object[] _slash_(Object[] o, Object sep) {
+        if (o.length <= 1) return o;
+        Object[] ret = new Object[o.length * 2 - 1];
+        for(int i=0; i<o.length; i++) {
+            Object oi = o[i];
+            //if (oi instanceof Rep) oi = ((Rep)oi).build(new MyDrop(sep));
+            ret[i*2]   = oi;
+            if (i*2+1<ret.length) ret[i*2+1] = new MyDrop(sep);
+        }
+        return ret;
+    }
     //public Element _tilde__slash__tilde_(final Element r) { return Repeat.maximal(r); }
-    public Object _plus__slash_(final Element r, Element s) { /*return Repeat.many1(r, s);*/ return new Rep(r, s, false, false); }
+    public Object _plus__slash_(final Element r, Object s) {
+        if (s instanceof String) s = CharToken.string((String)s);
+        return new Rep(r, (Element)s, false, false);
+    }
     //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 _plus__plus_(final Element r) { return new Rep(r, null, true, false); }
@@ -235,12 +249,15 @@ public class MetaGrammar extends ReflectiveWalker {
                 drops = new boolean[o.length];
                 int j = 0;
                 for(int i=0; i<o.length; i++) {
-                    if      (o[i] instanceof PreSequence) o2[j] = ((PreSequence)o[i]).buildUnion(ws);
-                    else if (o[i]==SELF)                  o2[j] = u.new Subset("(("+u+"))", set);
-                    else if (o[i] instanceof MyLift)      { o2[j] = CharToken.string(tag = ((MyLift)o[i]).s); drops[j] = true; }
-                    else if (o[i] instanceof String)      { o2[j] = CharToken.string(      ((String)o[i])  ); drops[j] = true; }
-                    else if (o[i] instanceof Rep)         o2[j] = ((Rep)o[i]).build(ws);
-                    else                                  o2[j] = (Element)o[i];
+                    Object oi = o[i];
+                    if (oi instanceof MyDrop)      { oi = ((MyDrop)oi).o; drops[j] = true; }
+                    if      (oi instanceof PreSequence) o2[j] = ((PreSequence)oi).buildUnion(ws);
+                    else if (oi==SELF)                  o2[j] = u.new Subset("(("+u+"))", set);
+                    else if (oi instanceof MyLift)      { o2[j] = CharToken.string(tag = ((MyLift)oi).s); drops[j] = true; }
+                    else if (oi instanceof String)      { o2[j] = CharToken.string(      ((String)oi)  ); drops[j] = true; }
+                    else if (oi instanceof Rep)         o2[j] = ((Rep)oi).build(ws);
+                    //else if (oi instanceof PreBrace)    o2[j]
+                    else                                  o2[j] = (Element)oi;
 
                     if (dropAll.contains(o2[j])) drops[j] = true;
 
@@ -339,6 +356,10 @@ public class MetaGrammar extends ReflectiveWalker {
         public final String s;
         public MyLift(String s) { this.s = s; }
     }
+    public static class MyDrop {
+        public final Object o;
+        public MyDrop(Object o) { this.o = o; }
+    }
 
     private static final Tree meta =