From: adam <adam@megacz.com>
Date: Sun, 2 Jul 2006 03:21:22 +0000 (-0400)
Subject: checkpoint
X-Git-Tag: tag_for_25-Mar~245
X-Git-Url: http://git.megacz.com/?p=sbp.git;a=commitdiff_plain;h=74e53cbf7227f5958ff7495abe31cb0462d62c4e

checkpoint

darcs-hash:20060702032122-5007d-1d4f1aa29f0fbec2bb61ae0970f45d3ebf17691b.gz
---

diff --git a/src/edu/berkeley/sbp/Repeat.java b/src/edu/berkeley/sbp/Repeat.java
index b7e7e39..89199c5 100644
--- a/src/edu/berkeley/sbp/Repeat.java
+++ b/src/edu/berkeley/sbp/Repeat.java
@@ -16,10 +16,15 @@ class Repeat extends Union {
         this(e, zeroOkay, manyOkay, separator, false, tag); }
     protected Repeat(final Element e, boolean zeroOkay, boolean manyOkay, final Element separator, boolean maximal, Object tag) {
         super(e+(!manyOkay ? "?" : (zeroOkay ? (maximal ? "**" : "*") : (maximal ? "++" : "+")))+(separator==null?"":("/"+separator)), true);
-        if (zeroOkay) {
+        if (zeroOkay && !manyOkay) {
             add(new Sequence.Constant.Empty());
-            if (manyOkay) add(new Sequence.Singleton(Sequence.many1(e, separator)));
-            else          add(new Sequence.Singleton(e));
+            add(new Sequence.Singleton(e));
+            return;
+        }
+        if (zeroOkay) {
+            add(new Sequence.RewritingSequence(tag, new Element[] { }, null));
+            // FUGLY
+            add(new Sequence.Singleton(Sequence.many1(e, separator, tag)));
         } else {
             add(new Sequence.RewritingSequence(tag, new Element[] { e }, null));
             if (separator==null)
diff --git a/src/edu/berkeley/sbp/misc/Demo.java b/src/edu/berkeley/sbp/misc/Demo.java
index 9c205d8..f163d93 100644
--- a/src/edu/berkeley/sbp/misc/Demo.java
+++ b/src/edu/berkeley/sbp/misc/Demo.java
@@ -30,9 +30,11 @@ public class Demo {
         Union meta = mgf.get("s").build(bc);
 
         System.err.println("parsing " + s[1]);
-        res = new CharParser(meta).parse(new FileInputStream(s[1])).expand1();
+        Tree t = new CharParser(meta).parse(new FileInputStream(s[1])).expand1();
 
-        System.out.println(res);
+        System.out.println(t.toPrettyString());
+        Reducer red = (Reducer)t.head();
+        System.out.println(red.reduce(t));
     }
 
     public static class ReflectiveMeta extends MetaGrammar.Meta {
@@ -66,6 +68,26 @@ public class Demo {
             if (match((nonterminal)con.getAnnotation(nonterminal.class), c, s)) return true;
             return false;
         }
+        public Object repeatTag() {
+            return new Reducer() {
+                    public String toString() { return "[**]"; }
+                    public Object reduce(Tree t) {
+                        Object[] ret = new Object[t.numChildren()];
+                        for(int i=0; i<t.numChildren(); i++) {
+                            Tree tc = t.child(i);
+                            if (tc.head() != null && tc.head() instanceof Reducer)
+                                ret[i] = ((Reducer)tc.head()).reduce(tc);
+                            else if (tc.numChildren() == 0)
+                                ret[i] = tc.head();
+                            else {
+                                System.err.println("FIXME: don't know what to do about " + tc);
+                                ret[i] = null;
+                            }
+                        }
+                        return ret;
+                    }
+                };
+        }
         public Sequence resolveTag(String tag, String nonTerminalName, Element[] els, Object[] labels, boolean[] drops) {
             Production p = new Production(tag, nonTerminalName, els, labels, drops);
             for(Method m : _cl.getMethods())
@@ -155,20 +177,19 @@ public class Demo {
         public abstract String getName();
         public abstract tag getTag();
         public abstract nonterminal getNonTerminal();
-        public abstract boolean buildSequence(Production p);
-        public abstract Sequence makeSequence(Production p);
+        public abstract int[] buildSequence(Production p);
         public boolean isCompatible(Production p) {
             tag t = getTag();
             if (t != null &&
                 (t.value().equals(p.tag) ||
                  (t.value().equals("") && p.tag.equals(getName()))))
-                return buildSequence(p);
+                return buildSequence(p)!=null;
 
             nonterminal n = getNonTerminal();
             if (n != null &&
                 (n.value().equals(p.nonTerminal) ||
                  (n.value().equals("") && p.nonTerminal.equals(getName()))))
-                return buildSequence(p);
+                return buildSequence(p)!=null;
 
             return false;
         }
@@ -184,24 +205,60 @@ public class Demo {
                 for(int i=0; i<p.count; i++) ret[i] = i;
                 return ret;
             } else if (argTagged==p.count) {
-                int[] ret = new int[argTagged];
+                int[] ret = new int[argtags.length];
                 int j = 0;
                 for(int i=0; i<argtags.length; i++)
-                    if (argtags[i]!=null)
-                        ret[j++] = i;
+                    ret[i] = argtags[i]==null ? -1 : (j++);
                 return ret;
             } else {
                 return null;
             }
         }
+        public Sequence makeSequence(Production p) {
+            return Sequence.rewritingSequence(new TargetReducer(p), p.elements, p.labels, p.drops);
+        }
+        public abstract Object plant(Object[] fields, int[] map);
+        public class TargetReducer implements Reducer {
+            private Production p;
+            private int[] map;
+            public TargetReducer(Production p) {
+                this.p = p;
+                this.map = buildSequence(p);
+            }
+            public String toString() { return "reducer-"+Target.this; }
+            public Object reduce(Tree t) {
+                Object[] objects = new Object[t.numChildren()];
+                for(int i=0; i<t.numChildren(); i++) {
+                    Tree tc = t.child(i);
+                    if (tc.head() != null && tc.head() instanceof Reducer)
+                        objects[i] = ((Reducer)tc.head()).reduce(tc);
+                    else if (tc.numChildren() == 0)
+                        objects[i] = tc.head();
+                    else if (t.numChildren()==1) {
+                        //FIXME: EVIL!!
+                        objects[i] = reduce(t.child(0));
+                    } else {
+                        System.err.println("FIXME: don't know what to do about " + tc);
+                        objects[i] = null;
+                    }
+                }
+                return plant(objects, map);
+            }
+        }
+    }
+
+    public static interface Reducer {
+        public Object reduce(Tree t);
     }
+
     public static class TargetClass extends Target {
         public final Class _class;
         public TargetClass(Class _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 boolean buildSequence(Production p) {
+        public String toString() { return _class.getSimpleName(); }
+        public int[] buildSequence(Production p) {
             Field[]  f       = _class.getDeclaredFields();
             String[] names   = new String[f.length];
             arg[]    argtags = new arg[f.length];
@@ -210,52 +267,98 @@ public class Demo {
                 argtags[i] = f[i].getAnnotation(arg.class);
             }
             int[] ret = buildSequence(p, names, argtags);
-            if (ret!=null) return true;
+            if (ret!=null) return ret;
             for(Constructor c : _class.getConstructors())
-                if (new TargetConstructor(c).buildSequence(p))
-                    return true;
-            return false;
+                if (new TargetConstructor(c).buildSequence(p)!=null)
+                    return new TargetConstructor(c).buildSequence(p);
+            return null;
         }
-        public Sequence makeSequence(Production p) {
-            return Sequence.rewritingSequence(_class, p.elements, p.labels, p.drops);
+        public Object plant(Object[] fields, int[] map) {
+            try {
+                Object ret = _class.newInstance();
+                Field[] f = _class.getFields();
+                int j = 0;
+                for(int i=0; i<f.length; i++)
+                    if (map[i] != -1) {
+                        Object tgt = Reflection.lub(fields[map[i]]);
+                        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));
+                        f[i].set(ret, tgt);
+                    }
+                return ret;
+            } catch (Exception e) {
+                e.printStackTrace();
+                throw new RuntimeException(e);
+            }
         }
     }
+
+    public static String stringify(Object o) {
+        if (o==null) return "";
+        if (!(o instanceof Object[])) return o.toString();
+        Object[] arr = (Object[])o;
+        StringBuffer ret = new StringBuffer();
+        for(int i=0; i<arr.length; i++)
+            ret.append(arr[i]);
+        return ret.toString();
+    }
+
     public static class TargetConstructor extends Target {
         public final Constructor _ctor;
         public TargetConstructor(Constructor _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 boolean buildSequence(Production p) {
+        public String toString() { return _ctor.getName(); }
+        public int[] buildSequence(Production p) {
             Annotation[][] annotations = _ctor.getParameterAnnotations();
             int len = annotations.length;
             int ofs = 0;
             String name = _ctor.getDeclaringClass().getName();
+            /*
             if (name.indexOf('$') > name.lastIndexOf('.')) {
                 len--;
                 ofs++;
             }
+            */
             String[] names   = new String[len];
             arg[]    argtags = new arg[len];
             for(int i=0; i<names.length; i++)
                 for(Annotation a : annotations[i+ofs])
                     if (a instanceof arg)
                         argtags[i+ofs] = (arg)a;
-            int[] ret = buildSequence(p, names, argtags);
-            if (ret!=null) return true;
-            return false;
+            return buildSequence(p, names, argtags);
         }
-        public Sequence makeSequence(Production p) {
-            return Sequence.rewritingSequence(_ctor, p.elements, p.labels, p.drops);
+        public Object plant(Object[] fields, int[] map) {
+            try {
+                Class[] argTypes = _ctor.getParameterTypes();
+                Object[] args = new Object[argTypes.length];
+                int j = 0;
+                for(int i=0; i<args.length; i++)
+                    if (map[i] != -1) {
+                        Object tgt = Reflection.lub(fields[map[i]]);
+                        if (argTypes[i] == String.class) tgt = stringify(tgt);
+                        // FUGLY
+                        tgt = coerce(tgt, argTypes[i]);
+                        System.err.println("setting a " + argTypes[i].getName() + " to " + Reflection.show(tgt));
+                        args[i] = tgt;
+                    }
+                return _ctor.newInstance(args);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
         }
     }
     public static class TargetMethod extends Target {
         public final Method _method;
         public TargetMethod(Method _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 boolean buildSequence(Production p) {
+        public int[] buildSequence(Production p) {
             Annotation[][] annotations = _method.getParameterAnnotations();
             String[] names   = new String[annotations.length];
             arg[]    argtags = new arg[annotations.length];
@@ -264,69 +367,118 @@ public class Demo {
                     if (a instanceof arg)
                         argtags[i] = (arg)a;
             int[] ret = buildSequence(p, names, argtags);
-            if (ret!=null) return true;
-            return false;
+            return ret;
         }
-        public Sequence makeSequence(Production p) {
-            return Sequence.rewritingSequence(_method, p.elements, p.labels, p.drops);
+        public Object plant(Object[] fields, int[] map) {
+            try {
+                Class[] argTypes = _method.getParameterTypes();
+                Object[] args = new Object[argTypes.length];
+                int j = 0;
+                for(int i=0; i<args.length; i++)
+                    if (map[i] != -1) {
+                        Object tgt = Reflection.lub(fields[map[i]]);
+                        if (argTypes[i] == String.class) tgt = stringify(tgt);
+                        // FUGLY
+                        tgt = coerce(tgt, argTypes[i]);
+                        System.err.println("setting a " + argTypes[i].getName() + " to " + Reflection.show(tgt));
+                        args[i] = tgt;
+                    }
+                return _method.invoke(null, args);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
         }
     }
 
-    public class MG {
-        public @tag void grammar(Grammar g) { }
-        public @nonterminal void Grammar(NonTerminal[] n) { }
-        public @nonterminal class Grammar {
+    public static Object coerce(Object o, Class c) {
+        if (o==null) return null;
+        if (c.isInstance(o)) return o;
+        if (c == char.class) {
+            return o.toString().charAt(0);
+        }
+        if (c.isArray() && (c.getComponentType().isInstance(o))) {
+            Object[] ret = (Object[])Array.newInstance(c.getComponentType(), 1);
+            ret[0] = o;
+            return ret;
+        }
+        if (o.getClass().isArray() && c.isArray()) {
+            boolean ok = true;
+            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]));
+                    ok = false;
+                }
+            }
+            if (ok) {
+                System.err.println("hit with " + c.getComponentType().getName());
+                return Array.newInstance(c.getComponentType(), ((Object[])o).length);
+            }
+        }
+        return o;
+    }
+
+    public static class MG {
+        public static @tag Grammar grammar(Grammar g) { return g; }
+        public static @nonterminal class Grammar {
             public @arg("NonTerminal") NonTerminal[] nonterminals;
+            public String toString() {
+                String ret = "[ ";
+                for(NonTerminal nt : nonterminals) ret += nt + ", ";
+                return ret + " ]";
+            }
         }
-        public @nonterminal class NonTerminal {
+        public static @nonterminal class NonTerminal extends El {
             public @arg("Word") String  name;
             public @arg("RHS")  Seq[][] sequences;
         }
 
-        public @tag void range(char c) { }
-        public @nonterminal class Range {
+        public static @tag void range(char c) { }
+        public static class Range extends El {
             public @tag("range") Range(char only) { first = only; last = only; }
-            public @arg char first;
-            public @arg char last;
+            public @tag("-")     Range(char first, char last) { this.first = first; this.last = last; }
+            public char first;
+            public char last;
         }
-        public class El { }
-        public abstract @nonterminal("Sequence") class Seq { }
-        public @tag("&")   Seq and(Sequence s,    Element[] elements) { return null; }
-        public @tag("&~")  Seq andnot(Sequence s, Element[] elements) { return null; }
-        public @tag        Seq ps(Element[] elements) { return null; }
-        public @tag("::")  Seq tag(String tagname, Seq seq) { return null; }
-        public @tag(":")   void colon(String s, Element e) { }
-        public @tag(")")   void close(String foo) { }
-        public @tag("/")   Seq slash(Seq s, Element e) { return null; }
-        public @tag("->")  Seq arrow(Seq s, Element e) { return null; }
+        public static class El { }
+        public static /*abstract*/ @nonterminal("Sequence") class Seq extends El { }
+        public static @tag("&")   Seq and(Sequence s,    El[] elements) { return new Seq(); }
+        public static @tag("&~")  Seq andnot(Sequence s, El[] elements) { return new Seq(); }
+        public static @tag        Seq ps(El[] elements) { return new Seq(); }
+        public static @tag        Seq psx(Seq s) { return s; }
+        public static @tag("::")  Seq tag(String tagname, Seq seq) { return new Seq(); }
+        public static @tag(":")   void colon(String s, El e) { }
+        public static @tag(")")   void close(String foo) { }
+        public static @tag("/")   Seq slash(Seq s, El e) { return new Seq(); }
+        public static @tag("->")  Seq arrow(Seq s, El e) { return new Seq(); }
 
-        public @tag("nonTerminal") class NonTerminalReference { public @arg String nonTerminal; }
-        public @tag("literal")     class StringLiteral        { public @arg String string; }
-        public @tag("()")          class Epsilon              { }
-        public @tag("{")           class Tree                 { @arg Seq body; }
-        public @tag("[")           class CharClass            { public CharClass(Range[] ranges) { } }
+        public static @tag("nonTerminal") class NonTerminalReference extends El { public @arg String nonTerminal; }
+        public static @tag("literal")     class StringLiteral        extends El { public @arg String string; }
+        public static @tag("()")          class Epsilon              extends El { }
+        public static @tag("{")           class Tree                 extends El { public @arg Seq body; }
+        public static                     class CharClass            extends El { public @tag("[") CharClass(Range[] ranges) { } }
 
-        public @tag("++")  void plusmax(El e) { }
-        public @tag("+")   void plus(El e) { }
-        public @tag("++/") void plusmaxfollow(El e, El sep) { }
-        public @tag("+/")  void plusfollow(El e, El sep) { }
-        public @tag("**")  void starmax(El e) { }
-        public @tag("*")   void star(El e) { }
-        public @tag("**/") void starmaxfollow(El e, El sep) { }
-        public @tag("*/")  void starfollow(El e, El sep) { }
-        public @tag("!")   void bang(El e) { }
-        public @tag("?")   void question(El e) { }
-        public @tag("^")   void caret(String s) { }
-        public @tag("~")   void tilde(El e) { }
-        public @tag("^^")  void doublecaret(El e) { }
-        public @tag("(")   void subexpression(Seq[][] rhs) { }
+        public static @tag("++")  void plusmax(El e) { }
+        public static @tag("+")   void plus(El e) { }
+        public static @tag("++/") void plusmaxfollow(El e, El sep) { }
+        public static @tag("+/")  void plusfollow(El e, El sep) { }
+        public static @tag("**")  void starmax(El e) { }
+        public static @tag("*")   void star(El e) { }
+        public static @tag("**/") void starmaxfollow(El e, El sep) { }
+        public static @tag("*/")  void starfollow(El e, El sep) { }
+        public static @tag("!")   void bang(El e) { }
+        public static @tag("?")   void question(El e) { }
+        public static @tag("^")   void caret(String s) { }
+        public static @tag("~")   void tilde(El e) { }
+        public static @tag("^^")  void doublecaret(El e) { }
+        public static @tag("(")   void subexpression(Seq[][] rhs) { }
 
-        public @nonterminal("Word")    String word(String s) { return null; }
-        public @nonterminal("Quoted")  String quoted(String s) { return null; }
-        public @nonterminal("escaped") String c(char c) { return null; }
-        public @tag("\"\"")            String emptystring() { return null; }
-        public @tag("\r")              String lf() { return null; }
-        public @tag("\n")              String cr() { return null; }
+        public static @nonterminal("Word")    String word(String s) { return null; }
+        public static @nonterminal("Quoted")  String quoted(String s) { return null; }
+        public static @nonterminal("escaped") String c(char c) { return null; }
+        public static @tag("\"\"")            String emptystring() { return null; }
+        public static @tag("\r")              String lf() { return null; }
+        public static @tag("\n")              String cr() { return null; }
     }
 
 }
diff --git a/src/edu/berkeley/sbp/misc/MetaGrammar.java b/src/edu/berkeley/sbp/misc/MetaGrammar.java
index 3420ad5..a284938 100644
--- a/src/edu/berkeley/sbp/misc/MetaGrammar.java
+++ b/src/edu/berkeley/sbp/misc/MetaGrammar.java
@@ -7,8 +7,6 @@ import java.io.*;
 
 public class MetaGrammar extends StringWalker {
 
-    public static Object repeatTag = null;
-
     public static Union make() throws Exception { return make(MetaGrammarTree.meta, "s"); }
     public static Union make(Tree<String> tree, String nt) throws Exception {
         Meta.MetaGrammarFile mgf = new Meta().new MetaGrammarFile(tree);
@@ -51,6 +49,7 @@ public class MetaGrammar extends StringWalker {
     }
 
     public static class Meta {
+        public Object repeatTag() { return null; }
         public Sequence resolveTag(String s, String nonTerminalName, Element[] els, Object[] labels, boolean [] drops) {
             return Sequence.rewritingSequence(s, els, labels, drops);
         }
@@ -208,7 +207,7 @@ public class MetaGrammar extends StringWalker {
                 }
                 Sequence ret = null;
                 if (dropAll)     ret = Sequence.drop(els, false);
-                else if (unwrap) ret = Sequence.unwrap(els, /*repeatTag FIXME*/null, drops);
+                else if (unwrap) ret = Sequence.unwrap(els, repeatTag(), drops);
                 else if (tag!=null) {
                     ret = resolveTag(tag, bc.currentNonTerminal==null ? null : bc.currentNonTerminal.name, els, labels, drops);
                 } else {
@@ -307,11 +306,11 @@ public class MetaGrammar extends StringWalker {
                 public Element build(BuildContext bc) {
                     return !maximal
                         ? (separator==null
-                           ? Sequence.repeat(element.build(bc), zero, many, null, null)
-                           : Sequence.repeat(element.build(bc), zero, many, separator.build(bc), null))
+                           ? Sequence.repeat(element.build(bc), zero, many, null, repeatTag())
+                           : Sequence.repeat(element.build(bc), zero, many, separator.build(bc), repeatTag()))
                         : (separator==null
-                           ? Sequence.repeatMaximal(infer(element.build(bc)), zero, many, null)
-                           : Sequence.repeatMaximal(element.build(bc), zero, many, infer(separator.build(bc)), null));
+                           ? Sequence.repeatMaximal(infer(element.build(bc)), zero, many, repeatTag())
+                           : Sequence.repeatMaximal(element.build(bc), zero, many, infer(separator.build(bc)), repeatTag()));
                 }
                 public MetaRepeat(MetaClause element, boolean maximal, MetaClause separator, boolean zero, boolean many) {
                     this.separator = separator;
diff --git a/src/edu/berkeley/sbp/util/Reflection.java b/src/edu/berkeley/sbp/util/Reflection.java
index 42267ce..fd43a45 100644
--- a/src/edu/berkeley/sbp/util/Reflection.java
+++ b/src/edu/berkeley/sbp/util/Reflection.java
@@ -51,6 +51,31 @@ public final class Reflection {
         return (Object[])Array.newInstance(c, i);
     }
 
+    public static String indent(String s, int indent) {
+        if (s.indexOf('\n')==-1) return s;
+        StringBuffer ret = new StringBuffer();
+        for(int i=0; i<s.length(); i++) {
+            char c = s.charAt(i);
+            ret.append(c);
+            if (c=='\n')
+                for(int j=0; j<indent; j++)
+                    ret.append(' ');
+        }
+        return ret.toString();
+    }
+
+    public static String show(Object o) {
+        if (o==null) return "null";
+        if (! (o instanceof Object[])) return o.toString() + " : " + o.getClass().getName();
+        Object[] arr = (Object[])o;
+        StringBuffer ret = new StringBuffer();
+        ret.append(o.getClass().getComponentType().getName());
+        ret.append("[]:\n");
+        for(int i=0; i<arr.length; i++)
+            ret.append(indent(show(arr[i]), 4) + "\n");
+        return ret.toString();
+    }
+
     public static Object lub(Object argo) {
         if (argo instanceof Object[]) return lub((Object[])argo);
         return argo;
diff --git a/tests/meta.g b/tests/meta.g
index cbfee2a..527cd46 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,5 +1,5 @@
-Grammar       =  NonTerminal +/ ws
 s             =  !ws (grammar::Grammar) !ws
+Grammar       =  NonTerminal +/ ws
 NonTerminal   =  Word ^"=" RHS /ws
 
 // use 'a'-'z' or 'a-z' instead of [a-z]?