String prefix = key.indexOf('.')==-1 ? "" : key.substring(0, key.lastIndexOf('.'));
String suffix = key.indexOf('.')==-1 ? key : key.substring(key.lastIndexOf('.')+1);
- //System.err.println("suffix = " + suffix);
MetaGrammar.Production p = new MetaGrammar.Production(suffix, suffix, els, drops);
for(Method m : _allMethods.get(prefix))
if (new MetaGrammar.Target(m).isCompatible(p))
public static @bind.as("#import") GrammarNode poundimport(String fileName, String as) {
if (as==null) as = "";
+ else if ("".equals(as)) { }
+ else as = as +".";
+
System.err.println("#import " + fileName + " as " + as);
try {
Tree t = new CharParser(MetaGrammar.make()).parse(new FileInputStream(fileName)).expand1();
}
public Seq(ElementNode e) { this(new ElementNode[] { e }); }
public Seq(ElementNode[] elements) { this.elements = elements; }
- public Seq tag(String tag) { this.tag = tag; return this; }
+ public Seq tag(String tag) { this.tag = prefix+tag; return this; }
public Seq follow(ElementNode 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;
+ ret.tag = prefix+tag;
return ret;
}
public Seq and(Seq s) { and.add(s); s.lame = true; return this; }
}
public Sequence build0(Context cx, boolean lame, NonTerminalNode cnt) {
boolean dropAll = lame;
- if (tag!=null && "()".equals(tag)) dropAll = true;
+ if (tag!=null && tag.endsWith("()")) dropAll = true;
boolean[] drops = new boolean[elements.length];
Element[] els = new Element[elements.length];
for(int i=0; i<elements.length; i++) {
{ return new Drop(e); }
public static @bind.as("^") ElementNode caret(final String s) {
+ final String thePrefix = prefix;
return new Drop(new Constant(CharRange.string(s)) {
- public String getOwnerTag() { return s; }
+ public String getOwnerTag() { return thePrefix+s; }
});
}
public static class TestCaseMaker extends AnnotationGrammarBindingResolver {
public TestCaseMaker() {
super(TestCaseMakerHelper.class);
- //add(MetaGrammarBindings.class, "grammar.");
- add(MetaGrammarBindings.class, "");
+ add(MetaGrammarBindings.class, "grammar");
+ //add(MetaGrammarBindings.class, "");
}
public static class TestCaseMakerHelper {
public static @bind.as("grammaro") @bind.raw Object grammaro(Iterable<Tree> t) {
Grammar = Declaration +/ ws
Declaration = NonTerminal
- | ^"#import" ws! FileName (ws! "as" ws! Prefix)?
+ | ^"#import" ws! FileName (ws! "as" ws! Word)?
-Prefix = ([a-zA-Z] ".")+ "*"
FileName = FileNameChar+ -> [\r\n ]
FileNameChar = Space:: "\\ "
| ~[\r\n ]
-#import tests/meta.g
+#import tests/meta.g as grammar
-ts = ts:: ws! tests ws!
-tests = test */ ws
-test = tca:: "testcase" "{" input (o::(output +/ ws)) (grammaro::Grammar) "}" /ws
- | tcb:: "testcase" "{" input (grammaro::Grammar) "}" /ws
-output = "output" Quoted ";" /ws
-input = "input" Quoted ";" /ws
+xws = grammar.ws
+ts = ts:: xws! tests xws!
+tests = test */ xws
+test = tca:: "testcase" "{" input (o::(output +/ xws)) (grammaro::grammar.Grammar) "}" /xws
+ | tcb:: "testcase" "{" input (grammaro::grammar.Grammar) "}" /xws
+output = "output" grammar.Quoted ";" /xws
+input = "input" grammar.Quoted ";" /xws