X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FMetaGrammar.java;h=f252ad56358954cde8a286645bec38756f5d7330;hp=fe92f6392b4856150a4c4550fab6131c0a3184d5;hb=75436cc6e44f18083d834a3c92b1e99a53e94b66;hpb=624e7fac78d26d8106c6e96330378d25319cf125 diff --git a/src/edu/berkeley/sbp/misc/MetaGrammar.java b/src/edu/berkeley/sbp/misc/MetaGrammar.java index fe92f63..f252ad5 100644 --- a/src/edu/berkeley/sbp/misc/MetaGrammar.java +++ b/src/edu/berkeley/sbp/misc/MetaGrammar.java @@ -35,11 +35,11 @@ public class MetaGrammar extends ReflectiveWalker { public Element _rightparen_(Object e) { return SELF; } public PreSequence _amp_(PreSequence p, Object[] o) { - p.needs.add(new PreSequence(o, null, true)); + p.and.add(new PreSequence(o, null, true).buildSequence(null, true, false)); return p; } public PreSequence _amp__tilde_(PreSequence p, Object[] o) { - p.hates.add(new PreSequence(o, null, true)); + p.not.add(new PreSequence(o, null, true).buildSequence(null, true, false)); return p; } @@ -47,10 +47,6 @@ public class MetaGrammar extends ReflectiveWalker { 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 Element _backtick_(Element r) { return new Unwrap(r); } - //public Element _hash_(Element e) { return e; } - //public Element _hash_(Element e) { return _plus__plus_(e); } - public PreSequence[] alternatives(PreSequence[] s) { return s; } public Object _leftparen_(PreSequence[][] p) { return nonTerminalZ(p); } @@ -87,21 +83,11 @@ public class MetaGrammar extends ReflectiveWalker { public MetaGrammar grammar(Object o, Union[] u, Object x) { return this; } public char _backslash_n() { return '\n'; } public char _backslash_r() { return '\r'; } - //public String literal(String s) { return s; } - - public Object literal(String s) { - Element e = CharToken.string(s); - return new MyDrop(e); - //dropAll.add(e); - //return e; - } - - public Range range(char a) { return new Range(a, a); } + 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 rangesx(Range[] rr) { return ranges("~", rr); } - public Element ranges(Range[] rr) { return ranges(null, rr); } 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) @@ -110,45 +96,6 @@ public class MetaGrammar extends ReflectiveWalker { else ret.remove(r); return CharToken.set(ret); } - public Element rangex(Object o, Object[] r) { - Range.Set ret = o==null ? new Range.Set() : new Range.Set(new Range(true, true)); - if (r != null) - for(Object aa : r) { - Range range = - aa instanceof Range - ? (Range)aa - : aa instanceof Character - ? new Range(((Character)aa).charValue()) - : new Range(((String)aa).charAt(0)); - if (o==null) ret.add(range); - else ret.remove(range); - } - return CharToken.set(ret); - } - - public String sify(Object arg) { - if (arg==null) return ""; - if (arg instanceof String) return (String)arg; - Object[] args = (Object[])arg; - while(true) { - args = Reflection.lub(args); - if (args instanceof String[]) { - StringBuffer ret = new StringBuffer(); - for(String s : ((String[])args)) ret.append(s); - return ret.toString(); - } - if (args instanceof Character[]) break; - if (!(args instanceof Object[])) break; - args = (Object[])args[0]; - } - if (args instanceof Character[]) { - char[] c = new char[args.length]; - for(int i=0; i temp = new HashSet(); for(PreSequence pre : s[i]) { - pre.hatess.addAll(seqs); + pre.not.addAll(seqs); Sequence seq = pre.buildSequence(n, false, dropAll); temp.add(seq); - //for(Sequence dom : seqs) seq.hates.add(dom); n.add(seq); } seqs.addAll(temp); @@ -197,11 +143,6 @@ public class MetaGrammar extends ReflectiveWalker { public char unescape(char c) { return StringUtil.unescapify("\\"+c).charAt(0); } public PreSequence sequence(Object[] o) { return new PreSequence(o, null); } - public static class PreBrace { - public final Object[] o; - public PreBrace(Object[] o) { this.o = o; } - } - 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, ""); } @@ -213,6 +154,11 @@ public class MetaGrammar extends ReflectiveWalker { return rewrite(o3); } + public static class PreBrace { + public final Object[] o; + public PreBrace(Object[] o) { this.o = o; } + } + public static class Rep { private final Element e; private final Element s; @@ -227,9 +173,8 @@ public class MetaGrammar extends ReflectiveWalker { } public static class PreSequence { - public final HashSet needs = new HashSet(); - public final HashSet hates = new HashSet(); - public final HashSet hatess = new HashSet(); + public final HashSet and = new HashSet(); + public final HashSet not = new HashSet(); public /*final*/ String tag; public final Object[] o; public final boolean keeper; @@ -265,21 +210,8 @@ public class MetaGrammar extends ReflectiveWalker { } public Sequence buildSequence(Union u) { return buildSequence(u, false, false); } public Sequence buildSequence(Union u, boolean lame, boolean dropAll) { - - HashSet and = new HashSet(); - HashSet not = new HashSet(); - for(PreSequence p : needs) { - Sequence ps = p.buildSequence(u, true, dropAll); - u.add(ps); - and.add(ps); - } - for(Sequence p : hatess) not.add(p); - for(PreSequence p : hates) { - Sequence ps = p.buildSequence(u, true, dropAll); - u.add(ps); - not.add(ps); - } - + for(Sequence s : and) u.add(s); + for(Sequence s : not) u.add(s); HashSet set = new HashSet(); Element[] expansion = expand(u, set); boolean keeper = this.keeper; @@ -346,29 +278,6 @@ public class MetaGrammar extends ReflectiveWalker { public static final Tree meta = - - - - - - - - - - - - - - - - - - - - - - - // DO NOT EDIT STUFF BELOW: IT IS AUTOMATICALLY GENERATED new Tree(null, "gram", new Tree[] { new Tree(null, null, new Tree[] { }), new Tree(null, "grammar", new Tree[] { new Tree(null, null, new Tree[] { new Tree(null, "::=", new Tree[] { new Tree(null, null, new Tree[] { new Tree(null, "s", new Tree[] { })}), @@ -931,3 +840,4 @@ new Tree(null, "gram", new Tree[] { new Tree(null, null, new Tree[] { }), +