X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FDemo.java;h=c9c18f39b818087f1312edc5b7792873c4b9274b;hp=140af81626dff3dfa146ea00f801b93d4beb8d59;hb=683552e3855cac7417a6f456867a0c1dd96502a4;hpb=643d10e52f2a42b603785a7e50f7f8aef272dfb0 diff --git a/src/edu/berkeley/sbp/misc/Demo.java b/src/edu/berkeley/sbp/misc/Demo.java index 140af81..c9c18f3 100644 --- a/src/edu/berkeley/sbp/misc/Demo.java +++ b/src/edu/berkeley/sbp/misc/Demo.java @@ -49,11 +49,11 @@ public class Demo { this(MG.class, new Class[] { MG.Grammar.class, - MG.NonTerminal.class, MG.AnonUn.class, MG.Range.class, MG.El.class, MG.Seq.class, + MG.NonTerminal.class, MG.NonTerminalReference.class, MG.StringLiteral.class, MG.XTree.class, @@ -71,21 +71,23 @@ public class Demo { if (c != null && t.equals("") && c.getSimpleName().equals(s)) return true; return false; } + /* private boolean match(nonterminal t, Class c, String s) { if (t==null) return false; if (t.value().equals(s)) return true; if (c != null && t.equals("") && c.getSimpleName().equals(s)) return true; return false; } + */ private boolean match(Class c, String s, String nonTerminalName) { if (match((tag)c.getAnnotation(tag.class), c, s)) return true; - if (match((nonterminal)c.getAnnotation(nonterminal.class), c, nonTerminalName)) return true; + //if (match((nonterminal)c.getAnnotation(tag.class), c, nonTerminalName)) return true; return false; } public boolean match(Constructor con, String s, String nonTerminalName) { Class c = con.getDeclaringClass(); if (match((tag)con.getAnnotation(tag.class), null, s)) return true; - if (match((nonterminal)con.getAnnotation(nonterminal.class), c, s)) return true; + //if (match((nonterminal)con.getAnnotation(tag.class), c, s)) return true; return false; } public Object repeatTag() { @@ -126,7 +128,9 @@ public class Demo { * that is arg-compatible. If value() is undefined, then the * class/constructor/method name is used. */ + /* @Retention(RetentionPolicy.RUNTIME) public static @interface nonterminal { String value() default ""; } + */ @Retention(RetentionPolicy.RUNTIME) public static @interface raw { } @@ -180,14 +184,18 @@ public class Demo { } public static abstract class Target { - public abstract String getName(); - public abstract tag getTag(); - public abstract nonterminal getNonTerminal(); public abstract int[] buildSequence(Production p); - private Reflection.Bindable _bindable; public Target(Reflection.Bindable b) { this._bindable = b; } + public String getName() { return _bindable.getSimpleName(); } + public tag getTag() { return (tag)_bindable.getAnnotation(tag.class); } + //public nonterminal getNonTerminal() { return (nonterminal)_bindable.getAnnotation(tag.class); } + public String toString() { return _bindable.getSimpleName(); } + public Object plant(Object[] fields) { return _bindable.impose(fields); } + public boolean isRaw() { return _bindable.isAnnotationPresent(raw.class); } + public Object invokeRaw(Iterable> t) { return _bindable.impose(new Object[] { t }); } + public boolean isCompatible(Production p) { tag t = getTag(); if (t != null && @@ -195,7 +203,7 @@ public class Demo { (t.value().equals("") && getName().equals(p.tag)))) return buildSequence(p)!=null; - nonterminal n = getNonTerminal(); + tag n = getTag(); if (n != null && (n.value().equals(p.nonTerminal) || (n.value().equals("") && getName().equals(p.nonTerminal)))) @@ -203,6 +211,7 @@ public class Demo { return false; } + public int[] buildSequence(Production p, String[] names, arg[] argtags) { int argTagged = 0; for(int i=0; i> t) { return null; } + public class TargetReducer implements Tree.TreeFunctor { private Production p; private int[] map; @@ -267,10 +275,6 @@ public class Demo { public static class TargetClass extends Target { public final Class _class; public TargetClass(Class _class) { super(Reflection.Bindable.create(_class)); this._class = _class; } - public String getName() { return _class.getSimpleName(); } - public tag getTag() { return (tag)_class.getAnnotation(tag.class); } - public nonterminal getNonTerminal() { return (nonterminal)_class.getAnnotation(nonterminal.class); } - public String toString() { return _class.getSimpleName(); } public int[] buildSequence(Production p) { Field[] f = _class.getDeclaredFields(); String[] names = new String[f.length]; @@ -286,19 +290,11 @@ public class Demo { return new TargetConstructor(c).buildSequence(p); return null; } - public Object plant(Object[] fields) { - return Reflection.impose(_class, fields); - } - } public static class TargetConstructor extends Target { public final Constructor _ctor; public TargetConstructor(Constructor _ctor) { super(Reflection.Bindable.create(_ctor)); this._ctor = _ctor; } - public String getName() { return _ctor.getName(); } - public tag getTag() { return (tag)_ctor.getAnnotation(tag.class); } - public nonterminal getNonTerminal() { return (nonterminal)_ctor.getAnnotation(nonterminal.class); } - public String toString() { return _ctor.getName(); } public int[] buildSequence(Production p) { Annotation[][] annotations = _ctor.getParameterAnnotations(); int len = annotations.length; @@ -318,17 +314,10 @@ public class Demo { argtags[i+ofs] = (arg)a; return buildSequence(p, names, argtags); } - public Object plant(Object[] fields) { - return Reflection.impose(_ctor, fields); - } } public static class TargetMethod extends Target { public final Method _method; public TargetMethod(Method _method) { super(Reflection.Bindable.create(_method)); this._method = _method; } - public String getName() { return _method.getName(); } - public String toString() { return _method.getName(); } - public tag getTag() { return (tag)_method.getAnnotation(tag.class); } - public nonterminal getNonTerminal() { return (nonterminal)_method.getAnnotation(nonterminal.class); } public int[] buildSequence(Production p) { Annotation[][] annotations = _method.getParameterAnnotations(); String[] names = new String[annotations.length]; @@ -340,14 +329,6 @@ public class Demo { int[] ret = buildSequence(p, names, argtags); return ret; } - public boolean isRaw() { return _method.isAnnotationPresent(raw.class); } - public Object invokeRaw(Iterable> t) { - return Reflection.impose(_method, new Object[] { t }); - } - public Object plant(Object[] fields) { - return Reflection.impose(_method, fields); - } - } public static Union cached = null; @@ -421,8 +402,8 @@ public class Demo { } public static class NonTerminal extends Un { public String name = null; - public @nonterminal("NonTerminal") NonTerminal(@arg("Word") String name, - @arg("RHS") Seq[][] sequences) { + public @tag("=") NonTerminal(@arg("Word") String name, + @arg("RHS") Seq[][] sequences) { this.name = name; this.sequences = sequences; } @@ -639,9 +620,9 @@ public class Demo { //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("Word") String word(String s) { return s; } + public static @tag("Quoted") String quoted(String s) { return s; } + public static @tag("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"; }