From 3f8696dcb17f7088ec004a9ef5960cc4d5fce60f Mon Sep 17 00:00:00 2001 From: adam Date: Sun, 2 Jul 2006 00:57:08 -0400 Subject: [PATCH] checkpoint darcs-hash:20060702045708-5007d-4696e6ee493c77d873a8fd40501d99bb7309fa20.gz --- src/edu/berkeley/sbp/misc/Demo.java | 264 +++++++++++++++++++++++----- src/edu/berkeley/sbp/misc/MetaGrammar.java | 4 +- 2 files changed, 223 insertions(+), 45 deletions(-) diff --git a/src/edu/berkeley/sbp/misc/Demo.java b/src/edu/berkeley/sbp/misc/Demo.java index 638bf31..1e5a5bc 100644 --- a/src/edu/berkeley/sbp/misc/Demo.java +++ b/src/edu/berkeley/sbp/misc/Demo.java @@ -21,7 +21,6 @@ public class Demo { MG.Seq.class, MG.NonTerminalReference.class, MG.StringLiteral.class, - MG.Epsilon.class, MG.Tree.class, MG.CharClass.class }); @@ -163,7 +162,7 @@ public class Demo { public int count = 0; public Production(String tag, String nonTerminal, Element[] elements, Object[] labels, boolean[] drops) { this.tag = tag; - this.elements = elements; // FIXME: use this + this.elements = elements; this.nonTerminal = nonTerminal; this.labels = labels; this.drops = drops; @@ -234,10 +233,7 @@ public class Demo { objects[i] = ((Reducer)tc.head()).reduce(tc); else if (tc.numChildren() == 0) objects[i] = tc.head(); - else if (t.numChildren()==1) { - //FIXME: EVIL!! - objects[i] = reduce(t.child(0)); - } else { + else { System.err.println("FIXME: don't know what to do about " + tc); objects[i] = null; } @@ -421,7 +417,6 @@ public class Demo { } public static class MG { - //public static @tag Grammar grammar(Grammar g) { return g; } public static @tag("grammar") class Grammar { public @arg("NonTerminal") NonTerminal[] nonterminals; public String toString() { @@ -433,54 +428,237 @@ public class Demo { public static @nonterminal class NonTerminal extends El { public @arg("Word") String name; public @arg("RHS") Seq[][] sequences; + private static int anon = 0; + public NonTerminal() { } + public NonTerminal(Seq[][] sequences) { + this.name = "anon" + (anon++); + this.sequences = sequences; + } + public Element build(Context cx) { + Element ret = cx.peek(name); + if (ret != null) return ret; + Union u = new Union(name); + cx.put(name, u); + HashSet bad = new HashSet(); + for(Seq[] group : sequences) { + Union u2 = new Union(""+anon++); + HashSet bad2 = new HashSet(); + for(Seq seq : group) { + Sequence built = seq.build(cx); + for(Sequence s : bad) + built = built.not(s); + u2.add(built); + bad2.add(built); + } + bad.addAll(bad2); + u.add(Sequence.singleton(u2)); + } + return u; + } } public static @tag void range(char c) { } - public static class Range extends El { + public static class Range { public @tag("range") Range(char only) { first = only; last = only; } public @tag("-") Range(char first, char last) { this.first = first; this.last = last; } public char first; public char last; } - public static class El { } - public static /*abstract*/ @nonterminal("Sequence") class Seq extends El { } - public static @tag("&") Seq and(Sequence s, El[] elements) { return new Seq(); } - public static @tag("&~") Seq andnot(Sequence s, El[] elements) { return new Seq(); } - public static @tag Seq ps(El[] elements) { return new Seq(); } - public static @tag Seq psx(Seq s) { return s; } - public static @tag("::") Seq tag(String tagname, Seq seq) { return new Seq(); } - public static @tag(":") void colon(String s, El e) { } - public static @tag(")") void close(String foo) { } - public static @tag("/") Seq slash(Seq s, El e) { return new Seq(); } - public static @tag("->") Seq arrow(Seq s, El e) { return new Seq(); } - - public static @tag("nonTerminal") class NonTerminalReference extends El { public @arg String nonTerminal; } - public static @tag("literal") class StringLiteral extends El { public @arg String string; } - public static @tag("()") class Epsilon extends El { } - public static @tag("{") class Tree extends El { public @arg Seq body; } - public static class CharClass extends El { public @tag("[") CharClass(Range[] ranges) { } } - - public static @tag("++") void plusmax(El e) { } - public static @tag("+") void plus(El e) { } - public static @tag("++/") void plusmaxfollow(El e, El sep) { } - public static @tag("+/") void plusfollow(El e, El sep) { } - public static @tag("**") void starmax(El e) { } - public static @tag("*") void star(El e) { } - public static @tag("**/") void starmaxfollow(El e, El sep) { } - public static @tag("*/") void starfollow(El e, El sep) { } - public static @tag("!") void bang(El e) { } - public static @tag("?") void question(El e) { } - public static @tag("^") void caret(String s) { } - public static @tag("~") void tilde(El e) { } - public static @tag("^^") void doublecaret(El e) { } - public static @tag("(") void subexpression(Seq[][] rhs) { } - - public static @nonterminal("Word") String word(String s) { return null; } - public static @nonterminal("Quoted") String quoted(String s) { return null; } + public static abstract class El { + public String getLabel() { return null; } + public String getOwnerTag() { return null; } + public boolean drop() { return false; } + public abstract Element build(Context cx); + } + public static class Drop extends El { + public El e; + public Drop(El e) { this.e = e; } + public String getLabel() { return null; } + public boolean drop() { return true; } + public Element build(Context cx) { return e.build(cx); } + } + public static class Label extends El { + public String label; + public El e; + public Label(String label, El e) { this.e = e; this.label = label; } + public String getLabel() { return label; } + public Element build(Context cx) { return e.build(cx); } + } + public static /*abstract*/ class Seq { + HashSet and = new HashSet(); + HashSet not = new HashSet(); + El[] elements; + El follow; + String tag = null; + public Seq(El e) { this(new El[] { e }); } + public Seq(El[] elements) { this.elements = elements; } + public Seq tag(String tag) { this.tag = tag; return this; } + public Seq follow(El follow) { this.follow = follow; return this; } + public Seq dup() { + Seq ret = new Seq(elements); + ret.and.addAll(and); + ret.not.addAll(not); + ret.follow = follow; + ret.tag = tag; + return ret; + } + public Seq and(Seq s) { and.add(s); return this; } + public Seq andnot(Seq s) { not.add(s); return this; } + public Seq separate(El sep) { + El[] elements = new El[this.elements.length * 2 - 1]; + for(int i=0; i " + ret); + ret = Sequence.rewritingSequence(tag, els, labels, drops); + } else { + int idx = -1; + for(int i=0; i") Seq arrow(Seq s, El e) { return s.follow(e); } + public static @tag("::") Seq tag(String tagname, Seq s) { return s.tag(tagname); } + public static @tag("/") Seq slash(Seq s, El e) { return s.separate(e); } + + public static @tag("ps") Seq seq(El[] elements) { return new Seq(elements); } + public static @tag Seq psx(Seq s) { return s; } + public static @tag(":") El colon(String s, El e) { return new Label(s, e); } + public static @tag(")") void close(String foo) { throw new Error("not supported"); } + public static @tag("()") El epsilon() { return new Constant(Union.epsilon); } + + public static @tag("nonTerminal") class NonTerminalReference extends El { + public @arg String nonTerminal; + public Element build(Context cx) { return cx.get(nonTerminal); } + } + public static class StringLiteral extends Constant { + public @tag("literal") StringLiteral(String string) { super(CharRange.string(string)); } + } + public static class CharClass extends El { + Range[] ranges; + public @tag("[") CharClass(Range[] ranges) { this.ranges = ranges; } + public Element build(Context cx) { + edu.berkeley.sbp.util.Range.Set set = new edu.berkeley.sbp.util.Range.Set(); + for(Range r : ranges) set.add(r.first, r.last); + return CharRange.set(set); + } + } + + public static @tag("{") class Tree extends El { + public @arg Seq body; + public Element build(Context cx) { + throw new Error(); + } + } + + public static class Rep extends El { + public El e, sep; + public boolean zero, many, max; + public Rep(El e, El sep, boolean zero, boolean many, boolean max) { + this.e = e; this.sep = sep; this.zero = zero; this.many = many; this.max = max;} + public Element build(Context cx) { + return max + ? Sequence.repeat(e.build(cx), zero, many, sep==null ? null : sep.build(cx), repeatTag()) + : sep==null + ? Sequence.repeatMaximal(MetaGrammar.infer(e.build(cx)), zero, many, repeatTag()) + : Sequence.repeatMaximal(e.build(cx), zero, many, MetaGrammar.infer(sep.build(cx)), repeatTag()); + } + } + public static class Constant extends El { + Element constant; + public Constant(Element constant) { this.constant = constant; } + public Element build(Context cx) { return constant; } + } + public abstract static class PostProcess extends El { + El e; + public PostProcess(El e) { this.e = e; } + public Element build(Context cx) { return postProcess(e.build(cx)); } + public abstract Element postProcess(Element e); + } + + // FIXME: it would be nice if we could hoist this into "Rep" + public static @tag("++") El plusmax(final El e) { return new Rep(e, null, false, true, true); } + public static @tag("+") El plus(final El e) { return new Rep(e, null, false, true, false); } + public static @tag("++/") El plusmaxfollow(final El e, final El sep) { return new Rep(e, sep, false, true, true); } + public static @tag("+/") El plusfollow(final El e, final El sep) { return new Rep(e, sep, false, true, false); } + public static @tag("**") El starmax(final El e) { return new Rep(e, null, true, true, true); } + public static @tag("*") El star(final El e) { return new Rep(e, null, true, true, false); } + public static @tag("**/") El starmaxfollow(final El e, final El sep) { return new Rep(e, sep, true, true, true); } + public static @tag("*/") El starfollow(final El e, final El sep) { return new Rep(e, sep, true, true, false); } + public static @tag("?") El question(final El e) { return new Rep(e, null, true, true, false); } + + public static @tag("!") El bang(final El e) { return new Drop(e); } + + public static @tag("^") El caret(final String s) { + return new Constant(CharRange.string(s)) { + public String getOwnerTag() { return s; } + }; + } + + public static @tag("~") El tilde(final El e) { + return new PostProcess(e) { + public Element postProcess(Element e) { + return MetaGrammar.infer((Topology)Atom.toAtom(e).complement()); + } }; } + + public static @tag("^^") void doublecaret(final El e) { throw new Error("not implemented"); } + + public static @tag("(") El subexpression(Seq[][] rhs) { return new NonTerminal(rhs); } + + public static @nonterminal("Word") String word(String s) { return s; } + public static @nonterminal("Quoted") String quoted(String s) { return s; } public static @nonterminal("escaped") String c(char c) { return c+""; } public static @tag("\"\"") String emptystring() { return ""; } public static @tag("\n") String retur() { return "\n"; } public static @tag("\r") String lf() { return "\r"; } + } + public static class Context { + HashMap map = new HashMap(); + public Union peek(String name) { return map.get(name); } + public void put(String name, Union u) { map.put(name, u); } + public Union get(String name) { + Union ret = map.get(name); + if (ret==null) map.put(name, ret = new Union(name)); + return ret; + } + } + public static Object repeatTag() { return null; } } diff --git a/src/edu/berkeley/sbp/misc/MetaGrammar.java b/src/edu/berkeley/sbp/misc/MetaGrammar.java index 826087c..73c6fdd 100644 --- a/src/edu/berkeley/sbp/misc/MetaGrammar.java +++ b/src/edu/berkeley/sbp/misc/MetaGrammar.java @@ -18,8 +18,8 @@ public class MetaGrammar extends StringWalker { private static Element set(Range.Set r) { return CharRange.set(r); } private static Element string(String s) { return CharRange.string(s); } - private static Atom infer(Element e) { return infer((Topology)Atom.toAtom(e)); } - private static Atom infer(Topology t) { return new CharRange(new CharTopology(t)); } + /*private*/ static Atom infer(Element e) { return infer((Topology)Atom.toAtom(e)); } + /*private*/ static Atom infer(Topology t) { return new CharRange(new CharTopology(t)); } private MetaGrammar() { } -- 1.7.10.4