import java.io.*;
// FIXME: non-static methods
-public class AnnotationGrammarBindingResolver extends Grammar.Bindings {
+public class AnnotationGrammarBindings extends Grammar.Bindings {
private static boolean harsh = true;
private HashMap<String,Class[]> _inner = new HashMap<String,Class[]>();
private HashMap<String,Method[]> _allMethods = new HashMap<String,Method[]>();
- public AnnotationGrammarBindingResolver(Class c) {
+ public AnnotationGrammarBindings(Class c) {
this._cl = c;
add(c, "");
}
public class Grammar {
/**
- * Create a grammar from a parse tree.
- *
- * @param t a tree produced by parsing a grammar using the metagrammar
- * @param s the name of the "start symbol"
- */
- public static Union create(Tree t, String s) {
- return create(t, s, new AnnotationGrammarBindingResolver(MetaGrammarBindings.class));
- }
-
- /**
* Create a grammar from a parse tree and binding resolver
*
* @param t a tree produced by parsing a grammar using the metagrammar
public static class Bindings {
public Object repeatTag() { return null; }
- public Sequence tryResolveTag(Production p) { return null; }
+ public Sequence tryResolveTag(Production p) {
+ if (p.tag==null) return null;
+ return Sequence.rewritingSequence(p.tag, p.elements, p.drops);
+ }
}
}
public static Union newInstance() {
return Grammar.create(MetaGrammar.meta,
"s",
- new AnnotationGrammarBindingResolver(MetaGrammarBindings.class));
+ new MetaGrammarBindings());
}
/** Used to rebuild MetaGrammar.java, and not for much else */
out.append("\n // DO NOT EDIT STUFF BELOW: IT IS AUTOMATICALLY GENERATED\n");
Tree t = MetaGrammar.meta;
- Union u = Grammar.create(t, "s");
+ Union u = Grammar.create(t, "s", new MetaGrammarBindings());
t = new CharParser((Union)u).parse(new FileInputStream(args[0])).expand1();
import java.io.*;
/** The java classes typically used to represent a parsed grammar AST; each inner class is a type of AST node. */
-public class MetaGrammarBindings {
+public class MetaGrammarBindings extends AnnotationGrammarBindings {
+
+ public MetaGrammarBindings() { super(MetaGrammarBindings.class); }
// FIXME ugly ugly ugly scary dangerous
public static String prefix = "";
+++ /dev/null
-package edu.berkeley.sbp.meta;
-import edu.berkeley.sbp.util.*;
-import edu.berkeley.sbp.*;
-import edu.berkeley.sbp.chr.*;
-import edu.berkeley.sbp.misc.*;
-import edu.berkeley.sbp.bind.*;
-import java.util.*;
-import java.lang.annotation.*;
-import java.lang.reflect.*;
-import java.io.*;
-
-public class TaggingGrammarBindingResolver extends Grammar.Bindings {
- public Object repeatTag() { return null; }
- public Sequence tryResolveTag(Production p) {
- if (p.tag==null) return null;
- return Sequence.rewritingSequence(p.tag, p.elements, p.drops);
- }
-}
Parser metaGrammarParser = new CharParser(MetaGrammar.newInstance());
Tree<String> parsedGrammar = metaGrammarParser.parse(new CharInput(new FileInputStream(s[0]))).expand1();
- Grammar.Bindings gbr = new AnnotationGrammarBindingResolver(Math.class);
+ Grammar.Bindings gbr = new AnnotationGrammarBindings(Math.class);
Union mathGrammar = Grammar.create(parsedGrammar, "Expr", gbr);
Parser mathParser = new CharParser(mathGrammar);
System.err.println("parsing " + s[0]);
Tree<String> res = new CharParser(MetaGrammar.newInstance()).parse(new FileInputStream(s[0])).expand1();
- Union meta = Grammar.create(res, "s");
+ Union meta = Grammar.create(res, "s", new MetaGrammarBindings());
System.err.println("parsing " + s[1]);
//SequenceInputStream sis = new SequenceInputStream(new FileInputStream(s[0]), new FileInputStream(s[1]));
}
}
- public static class TestCaseMaker extends AnnotationGrammarBindingResolver {
+ public static class TestCaseMaker extends AnnotationGrammarBindings {
public TestCaseMaker() {
super(TestCaseMakerHelper.class);
add(MetaGrammarBindings.class, "grammar");
}
public static class TestCaseMakerHelper {
public static @bind.as("grammaro") @bind.raw Object grammaro(Iterable<Tree> t) {
- return Grammar.create(t.iterator().next(), "s", new TaggingGrammarBindingResolver());
+ return Grammar.create(t.iterator().next(), "s", new Grammar.Bindings());
}
//public static @bind.as("tca") Object tca(Object[] o) throws IOException {
//return new TestCase((String)o[0], (String[])o[1], (Union)o[2], false, false); }
public static class TestCaseBuilder extends StringWalker {
public Object walk(Tree<String> tree) {
try {
- if ("grammaro".equals(tree.head())) return Grammar.create(tree, "s");
+ if ("grammaro".equals(tree.head())) return Grammar.create(tree, "s", new MetaGrammarBindings());
else if ("output".equals(tree.head())) return string(tree.children());
else if ("input".equals(tree.head())) return string(tree.children());
else if ("testcase".equals(tree.head())) {
String input = string(tree.child(0));
String[] output = tree.numChildren()>2 ? ((String[])walk(tree, 1)) : new String[0];
- Union grammar = Grammar.create(tree.child(tree.numChildren()-1), "s");
+ Union grammar = Grammar.create(tree.child(tree.numChildren()-1), "s", new MetaGrammarBindings());
TestCase tc = new TestCase(input, output, grammar, false, false);
return tc;
} else if ("ts".equals(tree.head())) return walk(tree, 0);
Tree<String> res = new CharParser(MetaGrammar.newInstance()).parse(new FileInputStream(s[0])).expand1();
- AnnotationGrammarBindingResolver resolver = new AnnotationGrammarBindingResolver(TD.class);
+ AnnotationGrammarBindings resolver = new AnnotationGrammarBindings(TD.class);
resolver.add(MetaGrammarBindings.class, "meta");
Union tibgram = Grammar.create(res, "s", resolver);