From fa49c4e86eaabb1fad07bcfdfb004aa1fc0dea8a Mon Sep 17 00:00:00 2001 From: adam Date: Wed, 5 Jul 2006 02:29:13 -0400 Subject: [PATCH 1/1] checkpoint darcs-hash:20060705062913-5007d-7e4f4101ec37b951a663f86bee49a47592eae297.gz --- Makefile | 4 +-- .../sbp/meta/AnnotationGrammarBindingResolver.java | 2 ++ src/edu/berkeley/sbp/meta/MetaGrammar.java | 33 +++++++++++++------- src/edu/berkeley/sbp/meta/MetaGrammarBindings.java | 4 +-- src/edu/berkeley/sbp/util/Reflection.java | 18 ++++++----- 5 files changed, 38 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index fec6d8d..daaf625 100644 --- a/Makefile +++ b/Makefile @@ -8,8 +8,8 @@ tibdoc: edu.berkeley.sbp.jar demo: edu.berkeley.sbp.jar $(java) -cp $< edu.berkeley.sbp.misc.Demo \ - tests/meta.g \ - tests/meta.g + tests/demo.g \ + '(11+2*3)-44' regress: make boot diff --git a/src/edu/berkeley/sbp/meta/AnnotationGrammarBindingResolver.java b/src/edu/berkeley/sbp/meta/AnnotationGrammarBindingResolver.java index 825dc56..ca10c04 100644 --- a/src/edu/berkeley/sbp/meta/AnnotationGrammarBindingResolver.java +++ b/src/edu/berkeley/sbp/meta/AnnotationGrammarBindingResolver.java @@ -36,6 +36,8 @@ public class AnnotationGrammarBindingResolver extends GrammarBindingResolver { public Sequence tryResolveTag(String tag, String nonTerminalName, Element[] els, Object[] labels, boolean[] drops) { MetaGrammar.Production p = new MetaGrammar.Production(tag, nonTerminalName, els, labels, drops); + if (labels != null && labels.length > 0 && "numeric".equals(labels[0])) + System.out.println("here! "); for(Method m : _cl.getMethods()) if (new MetaGrammar.Target(m).isCompatible(p)) return new MetaGrammar.Target(m).makeSequence(p); diff --git a/src/edu/berkeley/sbp/meta/MetaGrammar.java b/src/edu/berkeley/sbp/meta/MetaGrammar.java index aa02d5f..0e8968f 100644 --- a/src/edu/berkeley/sbp/meta/MetaGrammar.java +++ b/src/edu/berkeley/sbp/meta/MetaGrammar.java @@ -127,7 +127,7 @@ public class MetaGrammar { return buildSequence(p)!=null; bind b = getBind(); - System.out.println(_bindable.getClass().getSimpleName() + ": " + _bindable.getSimpleName()); + //System.out.println(_bindable.getClass().getSimpleName() + ": " + _bindable.getSimpleName()); if (b != null && getName().equals(p.tag)) return buildSequence(p)!=null; @@ -150,15 +150,27 @@ public class MetaGrammar { argTagged++; // FIXME: can be smarter here - if (names.length==p.count) { - int[] ret = new int[p.count]; - for(int i=0; i red = (Tree.TreeFunctor)t.head(); MetaGrammarBindings.Grammar g = (MetaGrammarBindings.Grammar)red.invoke(t.children()); Context cx = new Context(g,rm); Union u = null; for(MetaGrammarBindings.NonTerminal nt : g.nonterminals) { - System.out.println(nt.name); Union el = (Union)cx.get(nt.name); StringBuffer st = new StringBuffer(); el.toString(st); - System.err.println(st); if (nt.name.equals(s)) u = el; } return u; diff --git a/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java b/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java index 3ba3d2a..ca3b7fe 100644 --- a/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java +++ b/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java @@ -47,8 +47,8 @@ public class MetaGrammarBindings { } public static class NonTerminal extends Un { public String name = null; - public @bind NonTerminal(@bind.arg("Word") String name, - @bind.arg("RHS") Seq[][] sequences) { + public @bind NonTerminal(@bind.arg String name, + @bind.arg Seq[][] sequences) { this.name = name; this.sequences = sequences; } diff --git a/src/edu/berkeley/sbp/util/Reflection.java b/src/edu/berkeley/sbp/util/Reflection.java index 05de7dc..2cc7b0a 100644 --- a/src/edu/berkeley/sbp/util/Reflection.java +++ b/src/edu/berkeley/sbp/util/Reflection.java @@ -54,7 +54,7 @@ public final class Reflection { public static String show(Object o) { if (o==null) return "null"; - if (o instanceof Show) return ((Show)o).toString(); + if (o instanceof Show) return show((Show)o); if (! (o instanceof Object[])) return o.toString() + " : " + o.getClass().getName(); Object[] arr = (Object[])o; StringBuffer ret = new StringBuffer(); @@ -219,7 +219,7 @@ public final class Reflection { if (f[i].getType() == String.class) tgt = stringify(tgt); // FUGLY tgt = coerce(tgt, f[i].getType()); - System.err.println("setting a " + f[i].getType().getName() + " to " + Reflection.show(tgt)); + //System.err.println("setting a " + f[i].getType().getName() + " to " + Reflection.show(tgt)); f[i].set(ret, tgt); } return ret; @@ -239,10 +239,10 @@ public final class Reflection { if (argTypes[i] == String.class) tgt = Reflection.stringify(tgt); // FUGLY tgt = Reflection.coerce(tgt, argTypes[i]); - System.err.println("setting a " + argTypes[i].getName() + " to " + Reflection.show(tgt)); + //System.err.println("setting a " + argTypes[i].getName() + " to " + Reflection.show(tgt)); args[i] = tgt; } - System.err.println("invoking " + _method + " with " + Reflection.show(args)); + //System.err.println("invoking " + _method + " with " + Reflection.show(args)); return _method.invoke(null, args); } catch (Exception e) { throw new RuntimeException(e); @@ -259,7 +259,7 @@ public final class Reflection { if (argTypes[i] == String.class) tgt = Reflection.stringify(tgt); // FUGLY tgt = Reflection.coerce(tgt, argTypes[i]); - System.err.println("setting a " + argTypes[i].getName() + " to " + Reflection.show(tgt)); + //System.err.println("setting a " + argTypes[i].getName() + " to " + Reflection.show(tgt)); args[i] = tgt; } return _ctor.newInstance(args); @@ -284,6 +284,10 @@ public final class Reflection { if (c == char.class) { return o.toString().charAt(0); } + if (c==int.class || c==Integer.class) { + String s = (String)coerce(o, String.class); + return new Integer(Integer.parseInt(s)); + } if (o.getClass().isArray() && o.getClass().getComponentType().isArray() && @@ -311,12 +315,12 @@ public final class Reflection { for(int i=0; i<((Object[])o).length; i++) { Object ob = (((Object[])o)[i]); if (ob != null) { - System.err.println("no hit with " + c.getComponentType().getName() + " on " + Reflection.show(((Object[])o)[i])); + //System.err.println("no hit with " + c.getComponentType().getName() + " on " + Reflection.show(((Object[])o)[i])); ok = false; } } if (ok) { - System.err.println("hit with " + c.getComponentType().getName()); + //System.err.println("hit with " + c.getComponentType().getName()); return Array.newInstance(c.getComponentType(), ((Object[])o).length); } } -- 1.7.10.4