X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FMetaGrammar.java;h=d160680dc9dfcb58718b9bcf712f0a9edd36158b;hp=38ca93d6726d19017d714efe8c47f071e7b3e0ce;hb=83de4a54d4e180843453a84daf7c6800fbc7edad;hpb=12fcf9485f22d83519b89587f25e2497a0cbc616 diff --git a/src/edu/berkeley/sbp/misc/MetaGrammar.java b/src/edu/berkeley/sbp/misc/MetaGrammar.java index 38ca93d..d160680 100644 --- a/src/edu/berkeley/sbp/misc/MetaGrammar.java +++ b/src/edu/berkeley/sbp/misc/MetaGrammar.java @@ -27,37 +27,48 @@ public class MetaGrammar extends ReflectiveWalker { // 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 PreSequence _equals__greater_(Object[] o, String s) { return new PreSequence(o, s); } + 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 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 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 PreSequence[] alternatives(PreSequence[] s) { return s; } - public Union nonTerminal(String s) { return nonTerminalX(s, false, false); } - public Union nonTerminalY(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)); + 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 seqs = new HashSet(); + for(int i=0; i temp = new HashSet(); + for(PreSequence pre : s[i]) { + pre.not.addAll(seqs); + Sequence seq = pre.buildSequence(n, false, dropAll); + temp.add(seq); + n.add(seq); + } + seqs.addAll(temp); + } 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 _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[] _slash_(Object[] o, Object sep) { if (o.length <= 1) return o; Object[] ret = new Object[o.length * 2 - 1]; @@ -68,10 +79,11 @@ public class MetaGrammar extends ReflectiveWalker { } 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 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; } @@ -115,30 +127,9 @@ public class MetaGrammar extends ReflectiveWalker { 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; } - HashSet seqs = new HashSet(); - for(int i=0; i temp = new HashSet(); - for(PreSequence pre : s[i]) { - pre.not.addAll(seqs); - Sequence seq = pre.buildSequence(n, false, dropAll); - temp.add(seq); - n.add(seq); - } - seqs.addAll(temp); - } - 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); } @@ -148,24 +139,6 @@ public class MetaGrammar extends ReflectiveWalker { o3[o3.length-1] = o2; 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; - 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 PreSequence { public PreSequence not(Sequence s) { not.add(s); return this; } @@ -187,11 +160,9 @@ public class MetaGrammar extends ReflectiveWalker { for(int i=0; i