X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FMetaGrammar.java;h=cb67cba9a2b36e3ccf4a64173a85021defd9bf36;hp=eb061d039542c81ca5638f0c83526727ed1f0da4;hb=cb5151d11037144c14809f6516ce5c1f1976ef7f;hpb=590a67918a69bb23f63cef8cbfec46c031cd38d3

diff --git a/src/edu/berkeley/sbp/misc/MetaGrammar.java b/src/edu/berkeley/sbp/misc/MetaGrammar.java
index eb061d0..cb67cba 100644
--- a/src/edu/berkeley/sbp/misc/MetaGrammar.java
+++ b/src/edu/berkeley/sbp/misc/MetaGrammar.java
@@ -25,78 +25,11 @@ public class MetaGrammar extends ReflectiveWalker {
     public static Union epsilon = new Union("()");
     static { epsilon.add(Sequence.empty); }
 
-    // MetaGrammar //////////////////////////////////////////////////////////////////////////////
-
-    public Object      _star_(Element r)                                              { return new Rep(r, null, false, true); }
-    public Union       _colon__colon__equals_(String s, PreSequence[][] p)            { return nonTerminalZ(s, p); }
-    public Union       _bang__colon__colon__equals_(String s, PreSequence[][] p)      { return nonTerminalZ(s, p, true); }
-    public Union       _colon__colon__equals_(boolean q, String s, PreSequence[][] p) { return nonTerminalZ(s, p, q); }
-    public Element     epsilon(Object o, Object b)                                    { return epsilon; }
-    public Element     _rightparen_(Object e)                                         { return SELF; }
-
-    public PreSequence _amp_(PreSequence p, Object[] o)        { return p.and(new PreSequence(o, null, true).buildSequence(null, true, false)); }
-    public PreSequence _amp__tilde_(PreSequence p, Object[] o) {  return p.not(new PreSequence(o, null, true).buildSequence(null, true, false)); }
-
-    public Element     _bang_(Element r)                       { return r; }
-    public Object      care(String s)                          { return new MyLift(s); }
-    public Object      _caret_(String s)                       { return new MyLift(s); }
-    public Object      _leftparen__rightparen_()               { return epsilon; }
-        
-    public Object      _leftparen_(PreSequence[][] p) { return nonTerminalZ(p); }
-    public Union       nonTerminal(String s) { return nonTerminalX(s, false, false); }
-    public Union nonTerminalX(String s, boolean synthetic, boolean dropAll) {
-        Union n = s.equals(startSymbol) ? g : nt.get(s);
-        if (n == null) nt.put(s, n = new Union(s, synthetic));
-        if (dropAll) this.dropAll.add(n);
-        return n;
-    }
-    public Union       nonTerminalZ(PreSequence[][] p)           { return nonTerminalX("anon"+(anon++), p, false, false); }
-    public Union       nonTerminalZ(String s, PreSequence[][] p) { return nonTerminalX(s, p, false, false); }
-    public Union       nonTerminalZ(String s, PreSequence[][] p, boolean q) { return nonTerminalX(s, p, false, q); }
-    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];
-            ret[i*2]   = oi;
-            if (i*2+1<ret.length) ret[i*2+1] = new MyDrop(sep);
-        }
-        return ret;
-    }
-    public Object _plus__slash_(final Element r, Object s) { return new Rep(r, (Element)s, false, false); }
-    public Object _star__slash_(final Element r, Object s) { return new Rep(r, (Element)s, false, true); }
-    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; }
-    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(CharToken.string(s)); }
-    public Range     _minus_(char a, char b) { return new Range(a, b); }
-    public Element   _leftbracket_       (Range[] rr) { return ranges(null, rr); }
-    public Element   _leftbracket__tilde_(Range[] rr) { return ranges("~",  rr); }
-    public Range     range(char a)         { return new Range(a, a); }
-    public Element   ranges(Object o, Range[] rr) {
-        Range.Set ret = !"~".equals(o+"") ? new Range.Set() : new Range.Set(new Range(true, true));
-        if (rr != null)
-            for(Range r : rr)
-                if (!"~".equals(o+"")) ret.add(r);
-                else                   ret.remove(r);
-        return CharToken.set(ret);
-    }
-
-
     ////////////////////////////////////////////////////////////////////////////////
 
     private Union g;
     private HashMap<String,Union> nt;
     private int anon = 0;
-    private Element dws;
     private String startSymbol;
 
     public MetaGrammar() { this("s"); }
@@ -109,13 +42,30 @@ public class MetaGrammar extends ReflectiveWalker {
         nt = new HashMap<String,Union>();
         dropAll = new HashSet<Element>();
         nt.put(str, g);
-        this.dws = Repeat.maximal(Repeat.many0(nonTerminal("w")));
         return ret;
     }
 
-    public Union nonTerminalX(String str, PreSequence[][] s, boolean synthetic, boolean dropAll) {
-        Union n = nonTerminalX(str, synthetic, dropAll);
-        if (s == null || s.length==0) { n.add(Sequence.empty); return n; }
+
+    // MetaGrammar //////////////////////////////////////////////////////////////////////////////
+
+    public PreSequence _amp_(PreSequence p, Object[] o)        { return p.and(new PreSequence(o, null, true).buildSequence(null, true, false)); }
+    public PreSequence _amp__tilde_(PreSequence p, Object[] o) { return p.not(new PreSequence(o, null, true).buildSequence(null, true, false)); }
+    public Object      _star_(Element r)                                              { return Repeat.many0(r); }
+    public Element     epsilon(Object o, Object b)                                    { return epsilon; }
+    public Element     _rightparen_(Object e)                                         { return SELF; }
+    public Element     _bang_(Element r)                                              { return r; }
+    public Object      _caret_(String s)                                              { return new MyLift(s); }
+    public Object      _leftparen__rightparen_()                                      { return epsilon; }
+    public Union       nonTerminal(String s)                                          { return nonTerminal(s, null, false, false); }
+    public Union       _colon__colon__equals_(String s, PreSequence[][] p)            { return nonTerminal(s, p, false, false); }
+    public Union       _bang__colon__colon__equals_(String s, PreSequence[][] p)      { return nonTerminal(s, p, false, true); }
+    public Union       _colon__colon__equals_(boolean q, String s, PreSequence[][] p) { return nonTerminal(s, p, false, q); }
+    public Object      _leftparen_(PreSequence[][] p)                                 { return nonTerminal("anon"+(anon++), p, false, false); }
+    public Union       nonTerminal(String str, PreSequence[][] s, boolean synthetic, boolean dropAll) {
+        Union n = str.equals(startSymbol) ? g : nt.get(str);
+        if (n == null) nt.put(str, n = new Union(str, synthetic));
+        if (dropAll) this.dropAll.add(n);
+        if (s==null) return n;
         HashSet<Sequence> seqs = new HashSet<Sequence>();
         for(int i=0; i<s.length; i++) {
             if (s[i]==null) continue;
@@ -131,38 +81,55 @@ public class MetaGrammar extends ReflectiveWalker {
         return n;
     }
 
-    public String stringify(String s) { return StringUtil.unescapify(s); }
-    public char unescape(char x, char c) { return unescape(c); }
-    public char unescape(char c) { return StringUtil.unescapify("\\"+c).charAt(0); }
-    public PreSequence sequence(Object[] o) { return new PreSequence(o, null); }
-
-    public PreSequence _equals__greater_(Object[] o, String s) { return new PreSequence(o, s); }
-    public PreSequence wrap(Object[] o) { return new PreSequence(o, ""); }
-    public PreSequence mwrap(Object[] o) { return new PreSequence(o, ""); }
-    public PreSequence rewrite(Object[] o) { return new PreSequence(o, null); }
-    public PreSequence rewrite(Object[] o, Object o2) {
-        Object[] o3 = new Object[o.length + 1];
-        System.arraycopy(o, 0, o3, 0, o.length);
-        o3[o3.length-1] = o2;
-        return rewrite(o3);
+    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 PreSequence rewrite(Object[] o)                                            { return new PreSequence(o, null); }
+    public PreSequence _equals__greater_(Object[] o, String s)                        { return new PreSequence(o, s); }
+    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];
+        for(int i=0; i<o.length; i++) {
+            Object oi = o[i];
+            ret[i*2]   = oi;
+            if (i*2+1<ret.length) ret[i*2+1] = new MyDrop(sep);
+        }
+        return ret;
     }
-        
-    public static class PreBrace {
-        public final Object[] o;
-        public PreBrace(Object[] o) { this.o = o; }
+
+    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 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(CharToken.string(s)); }
+    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); }
+    public Element   _leftbracket__tilde_(Range[] rr) { return ranges(false,  rr); }
+    public Element   ranges(boolean positive, Range[] rr) {
+        Range.Set ret = positive ? new Range.Set() : new Range.Set(new Range(true, true));
+        if (rr != null)
+            for(Range r : rr)
+                if (positive) ret.add(r);
+                else          ret.remove(r);
+        return CharToken.set(ret);
     }
 
-    public static class Rep {
-        private final Element e;
-        private final Element s;
-        private final boolean maximal;
-        private final boolean zero;
-        public Rep(Element e, Element s, boolean maximal, boolean zero) { this.e = e; this.s = s; this.zero = zero; this.maximal = maximal;}
-        public Element build() {
-            Element sep = s;
-            Element ret = zero ? Repeat.many0(e, sep) :  Repeat.many1(e, sep);
-            return maximal ? Repeat.maximal(ret) : ret;
-        }
+    public static class MyLift {
+        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; }
     }
 
     public static class PreSequence {
@@ -177,27 +144,6 @@ public class MetaGrammar extends ReflectiveWalker {
         public PreSequence(Object[] o, String tag) { this(o, tag, false); }
         public PreSequence(Object[] o, String tag, boolean keeper) { this.o = o; this.tag = tag; this.keeper = keeper; }
         boolean[] drops = null;
-        public Element[] expand(Union u, HashSet<Sequence> set) {
-            if (o==null) return new Element[0];
-            Element[] o2 = new Element[o.length];
-            drops = new boolean[o.length];
-            int j = 0;
-            for(int i=0; i<o.length; 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();
-                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 Rep)         o2[j] = ((Rep)oi).build();
-                else                                  o2[j] = (Element)oi;
-
-                if (dropAll.contains(o2[j])) drops[j] = true;
-
-                o2[j] = o2[j];
-                j++;
-            }
-            return o2;
-        }
         public Union    buildUnion() {
             Union u = new Union("???");
             u.add(buildSequence(u));
@@ -208,13 +154,27 @@ public class MetaGrammar extends ReflectiveWalker {
             for(Sequence s : and) u.add(s);
             for(Sequence s : not) u.add(s);
             HashSet<Sequence> set = new HashSet<Sequence>();
-            Element[] expansion = expand(u, set);
+            Element[] o2 = o==null ? new Element[0] : new Element[o.length];
+            if (o != null) {
+                drops = new boolean[o.length];
+                int j = 0;
+                for(int i=0; i<o.length; i++) {
+                    Object oi = o[i];
+                    if (oi instanceof MyDrop)      { oi = ((MyDrop)oi).o; drops[j] = true; }
+
+                    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                             o2[j] = (Element)oi;
+
+                    if (MetaGrammar.dropAll.contains(o2[j])) drops[j] = true;
+                    o2[j] = o2[j];
+                    j++;
+                }
+            }
+            Element[] expansion = o2;
             boolean keeper = this.keeper;
             Sequence ret = dropAll || lame || keeper ? Sequence.drop(expansion, and, not, lame) : null;
-            if (ret==null && tag!=null) {
-                for(int i=0; i<expansion.length; i++) expansion[i] = expansion[i];
-                ret = Sequence.rewritingSequence(tag, expansion, drops, and, not);
-            }
+            if (ret==null && tag!=null) ret = Sequence.rewritingSequence(tag, expansion, drops, and, not);
             if (ret==null) {
                 int idx = -1;
                 for(int i=0; i<expansion.length; i++) {
@@ -262,15 +222,6 @@ public class MetaGrammar extends ReflectiveWalker {
         os.close();
     }
 
-    public static class MyLift {
-        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; }
-    }
-
     public static final Tree meta =