public static class Production {
public String tag;
- public String nonTerminal;
- public Object[] labels;
public boolean[] drops;
public Element[] elements;
public int count = 0;
- public Production(String tag, String nonTerminal, Element[] elements, Object[] labels, boolean[] drops) {
+ public Production(String tag, Element[] elements, boolean[] drops) {
this.tag = tag;
this.elements = elements;
- this.nonTerminal = nonTerminal;
- this.labels = labels;
this.drops = drops;
for(int i=0; i<drops.length; i++)
if (!drops[i])
public static class Target {
public int[] buildSequence(Production p) {
Annotation[][] annotations = _bindable.getArgAnnotations();
+ Class[] types = _bindable.getArgTypes();
String[] names = _bindable.getArgNames();
- String name = _bindable.getSimpleName();
- int len = annotations.length;
- int ofs = 0;
+ String name = _bindable.getSimpleName();
+ int len = annotations.length;
+ int ofs = 0;
bind.arg[] argtags = new bind.arg[len];
for(int i=0; i<names.length; i++)
for(Annotation a : annotations[i+ofs])
if (a instanceof bind.arg)
argtags[i+ofs] = (bind.arg)a;
- return Target.this.buildSequence(p, names, argtags);
+ return Target.this.buildSequence(p, names, argtags, types);
}
private Bindable _bindable;
return buildSequence(p)!=null;
if (t != null &&
- (t.value().equals(p.nonTerminal)))
+ (t.value().equals(p.tag)))
return buildSequence(p)!=null;
if (t != null &&
- ((t.value().equals("") && getName().equals(p.nonTerminal))))
+ ((t.value().equals("") && getName().equals(p.tag))))
return buildSequence(p)!=null;
- if (b != null && getName().equals(p.nonTerminal))
+ if (b != null && getName().equals(p.tag))
return buildSequence(p)!=null;
return false;
}
- public int[] buildSequence(Production p, String[] names, bind.arg[] argtags) {
+ public int[] buildSequence(Production p, String[] names, bind.arg[] argtags, Class[] types) {
int argTagged = 0;
- for(int i=0; i<argtags.length; i++)
+ boolean hasloc = types.length>0 && types[0]==Input.Region.class;
+ for(int i=0; i<argtags.length; i++) {
+ if (i==0 && types[0]==Input.Region.class) continue;
if (argtags[i] != null)
argTagged++;
+ }
+ int numNames = names.length;
+ if (hasloc) numNames--;
// FIXME: can be smarter here
if (argTagged==p.count) {
int[] ret = new int[argtags.length];
int j = 0;
for(int i=0; i<argtags.length; i++) {
+ if (i==0 && types[0]==Input.Region.class) continue;
if (argtags[i]==null) continue;
if (argtags[i].value().equals(""))
ret[i] = j++;
}
}
return ret;
- } else if (names.length==p.count) {
+ } else if (numNames==p.count) {
int[] ret = new int[p.count];
- for(int i=0; i<p.count; i++) ret[i] = i;
+ for(int i=0; i<p.count; i++) ret[i] = i+(hasloc?1:0);
return ret;
} else {
return null;
}
public Sequence makeSequence(Production p) {
return Sequence.rewritingSequence(new TargetReducer(buildSequence(p), _bindable, isRaw()),
- p.elements, p.labels, p.drops);
+ p.elements, p.drops);
}
}
this._israw = raw;
}
public String toString() { return "reducer-"+_bindable.toString(); }
- public Object invoke(Iterable<Tree<Object>> t) {
+ public Object invoke(Tree<Object> t) {
if (_israw) return _bindable.impose(new Object[] { t });
ArrayList ret = new ArrayList();
for(Tree tc : t) {
if (tc.head() != null && tc.head() instanceof Functor)
- ret.add(((Tree.TreeFunctor<Object,Object>)tc.head()).invoke(tc.children()));
+ ret.add(((Tree.TreeFunctor<Object,Object>)tc.head()).invoke(tc));
else if (tc.numChildren() == 0)
ret.add(tc.head());
else {
Object[] o = (Object[])ret.toArray(new Object[0]);
int max = 0;
for(int i=0; i<map.length; i++) max = Math.max(map[i], max);
+ if (_bindable.getArgTypes().length > 0 &&
+ _bindable.getArgTypes()[0]==Input.Region.class)
+ max++;
Object[] o2 = new Object[max+1];
for(int i=0; i<o.length; i++) o2[map[i]] = o[i];
+ if (_bindable.getArgTypes().length > 0 &&
+ _bindable.getArgTypes()[0]==Input.Region.class)
+ o2[0] = t.getRegion();
return _bindable.impose(o2);
}
}
public static Union make(Tree t, String s) { return make(t, s, new AnnotationGrammarBindingResolver(MetaGrammarBindings.class)); }
public static Union make(Tree t, String s, GrammarBindingResolver rm) {
Tree.TreeFunctor<Object,Object> red = (Tree.TreeFunctor<Object,Object>)t.head();
- MetaGrammarBindings.GrammarNode g = (MetaGrammarBindings.GrammarNode)red.invoke(t.children());
+ MetaGrammarBindings.GrammarNode g = (MetaGrammarBindings.GrammarNode)red.invoke(t);
return g.build(s, rm);
}