X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FRegressionTests.java;h=353866d3d6ae8c0f51b9064bc438a00afe305353;hb=7d1d5b9e2969e687cc07592f5a212681f8d26479;hp=9429b694fb77df8348f97fba4b76a730846b6ad2;hpb=96a2822a729e563a64173f22dc184bc972a200ef;p=sbp.git

diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java
index 9429b69..353866d 100644
--- a/src/edu/berkeley/sbp/misc/RegressionTests.java
+++ b/src/edu/berkeley/sbp/misc/RegressionTests.java
@@ -1,9 +1,12 @@
 package edu.berkeley.sbp.misc;
 import java.io.*;
 import java.util.*;
+import java.lang.reflect.*;
 import edu.berkeley.sbp.*;
 import edu.berkeley.sbp.misc.*;
 import edu.berkeley.sbp.tib.*;
+import edu.berkeley.sbp.chr.*;
+import edu.berkeley.sbp.util.*;
 
 public class RegressionTests {
 
@@ -22,28 +25,42 @@ public class RegressionTests {
             //MetaGrammar mg0 = new MetaGrammar();
             //mg0.walk(MetaGrammar.meta);
             //System.out.println(mg0);
-            Tree<String> res = new CharToken.CharToStringParser(MetaGrammar.make()).parse1(new CharToken.Stream(new InputStreamReader(new FileInputStream(s[0]))));
-            MetaGrammar mg = (MetaGrammar)new MetaGrammar().walk(res);
+            System.err.println("parsing " + s[0]);
+            Tree<String> res = new CharParser(MetaGrammar.make()).parse(new FileInputStream(s[0])).expand1();
             //System.out.println(mg);
-            Union meta = mg.done();
+            Union meta = MetaGrammar.make();
+            System.err.println("parsing " + s[1]);
             SequenceInputStream sis = new SequenceInputStream(new FileInputStream(s[0]), new FileInputStream(s[1]));
-            res = new CharToken.CharToStringParser(meta).parse1(new CharToken.Stream(new InputStreamReader(sis), "parsing " + s[1] + " using " + s[0]));
-            Union testcasegrammar = ((MetaGrammar)new MetaGrammar("ts").walk(res)).done("ts");
+            res = new CharParser(meta).parse(sis).expand1();
+            Union testcasegrammar = MetaGrammar.make(res, "ts");
             if (testcasegrammar==null) return;
-            CharToken.Stream cs = new CharToken.Stream(new InputStreamReader(new FileInputStream(s[2])), "parsing " + s[2] + " using " + s[1]);
-            Parser parser = new CharToken.CharToStringParser(testcasegrammar);
+            CharParser parser = new CharParser(testcasegrammar);
 
             if (profile) {
                 System.out.println("\nready...");
                 System.in.read();
             }
-            Forest<String> r2 = parser.parse(cs);
+            System.gc();
+            long now = System.currentTimeMillis();
+            System.err.println("parsing " + s[2]);
+            Forest<String> r2 = parser.parse(new FileInputStream(s[2]));
+            System.out.println();
+            System.out.println("elapsed = " + (System.currentTimeMillis()-now) + "ms");
             if (profile) {
                 System.out.println("\ndone");
                 System.in.read();
                 System.exit(0);
             }
-            for(TestCase tc : (TestCase[])new TestCaseBuilder().walk(r2.expand1())) tc.execute();
+            System.err.println("expanding...");
+            GraphViz gv = new GraphViz();
+            r2.toGraphViz(gv);
+            FileOutputStream fox = new FileOutputStream("out.dot");
+            gv.dump(fox);
+            fox.close();
+
+            TestCase[] expanded = (TestCase[])new TestCaseBuilder().walk(r2.expand1());
+            System.err.println("executing...");
+            for(TestCase tc : expanded) tc.execute();
 
         } catch (Throwable t) {
             System.err.println("\n\nexception thrown, class == " + t.getClass().getName());
@@ -55,14 +72,14 @@ public class RegressionTests {
     }
 
     public static class TestCase {
-        private final Token.Stream inp;
-        public final String input;
+        private final boolean tib;
+        private final boolean jav;
+        public final String input;        
         public final String[] output;
         public final Union grammar;
-        public TestCase(String input, String[] output, Union grammar, boolean tib) throws IOException {
-            this.inp = tib
-                ? new Tib(input)
-                : new CharToken.Stream(new StringReader(input), input.indexOf('\n')==-1?"\""+input+"\": ":"");
+        public TestCase(String input, String[] output, Union grammar, boolean tib, boolean jav) throws IOException {
+            this.tib = tib;
+            this.jav = jav;
             this.input = input;
             this.output = output;
             this.grammar = grammar;
@@ -74,13 +91,34 @@ public class RegressionTests {
             return ret;
         }
         public boolean execute() throws Exception {
-            Forest<String> res = new CharToken.CharToStringParser(grammar).parse(inp);
+            if (jav) {
+                Forest<String> tree = new CharParser(grammar).parse(new StringReader(input));
+                FileOutputStream fos = new FileOutputStream("/Users/megacz/Desktop/out.dot");
+                PrintWriter p = new PrintWriter(new OutputStreamWriter(fos));
+                GraphViz gv = new GraphViz();
+                tree.toGraphViz(gv);
+                gv.dump(p);
+                p.flush();
+                p.close();
+                return true;
+            }
+            Forest<String> res = null;
+            ParseFailed pfe = null;
+            try {
+                res = tib 
+                    ? /*new CharParser(grammar).parse(new Tib(input))*/ null
+                : new CharParser(grammar).parse(new StringReader(input));
+            } catch (ParseFailed pf) {
+                pfe = pf;
+            }
+            //ystem.out.println("res=="+res);
             Collection<Tree<String>> results = res==null ? new HashSet<Tree<String>>() : res.expand(false);
             System.out.print("\r");
-            if (results.size() == 0 && output.length > 0) {
+            if (results == null || (results.size() == 0 && (output!=null && output.length > 0))) {
                 System.out.print("\033[31m");
                 System.out.println("PARSE FAILED");
                 System.out.print("\033[0m");
+                if (pfe != null) pfe.printStackTrace();
             } else {
                 System.out.print("\r                                                                                                              \r");
             }
@@ -110,27 +148,121 @@ public class RegressionTests {
         }
     }
 
-    public static class TestCaseBuilder extends MetaGrammar {
+    public static class TestCaseBuilder extends StringWalker {
         public Object walk(Tree<String> tree) {
             try {
-                if ("grammar".equals(tree.head())) { walkChildren(tree); return done("s"); }
-                else if ("output".equals(tree.head())) return string(tree.children());
-                else if ("input".equals(tree.head())) return string(tree.children());
-                else if ("tibcase".equals(tree.head()) || "testcase".equals(tree.head())) {
-                    String input = string(tree.child(0));
+                if ("grammar".equals(tree.head())) return MetaGrammar.make(tree, "s");
+                else if ("output".equals(tree.head())) return MetaGrammar.string(tree.children());
+                else if ("input".equals(tree.head())) return MetaGrammar.string(tree.children());
+                else if ("testcase".equals(tree.head())) {
+                    String input = MetaGrammar.string(tree.child(0));
                     String[] output = tree.numChildren()>2 ? ((String[])walk(tree, 1)) : new String[0];
-                    boolean tib = "tibcase".equals(tree.head());
-                    MetaGrammar gram = tib ? new Tib.Grammar() : new MetaGrammar();
-                    Union grammar = (Union)((MetaGrammar)(gram.walk(tree, tree.numChildren()-1))).done("s");
-                    return new TestCase(input, output, grammar, tib);
+                    Union grammar = MetaGrammar.make(tree.child(tree.numChildren()-1), "s");
+                    TestCase tc = new TestCase(input, output, grammar, false, false);
+                    return tc;
                 } else if ("ts".equals(tree.head())) return walk(tree, 0);
-                else return super.walk(tree);
+                else if (tree.head() == null) {
+                    Object[] ret = new Object[tree.numChildren()];
+                    for(int i=0; i<ret.length; i++)
+                        ret[i] = walk(tree.child(i));
+                    return Reflection.lub(ret);
+                }
+                return super.walk(tree);
             } catch (Exception e) {
                 throw new Error(e);
             }
         }
     }
+    /*
+    public static class JavaGrammar extends MetaGrammar {
+        public Object convertLabel(String label) { return new ClassMark(label); }
+        public Object convertFieldLabel(String label) { return new FieldMark(label); }
 
+        private static class FieldMark {
+            public final String field;
+            public FieldMark(String field) { this.field = field; }
+            public String toString() { return "."+field; }
+        }
+        private static class ClassMark {
+            public final String clazz;
+            public ClassMark(String clazz) { this.clazz = clazz; }
+            public String toString() { return clazz+"$"; }
+        }
+
+        public static Object build(Tree<Object> t, Class c) throws Exception {
+            System.out.println("** build " + c.getName() + " " + t.toPrettyString());
+            Object h = t.head();
+            if (h instanceof ClassMark) return build2(t, Class.forName(JavaGrammar.class.getName()+"$"+((ClassMark)h).clazz));
+            Object o = null;
+            if (t.numChildren()==0) o = t.head();
+            else if (t.head()==null) return build2(t, c);
+            else if (t.head() instanceof FieldMark) {
+                return build2(new Tree(null, new Tree[] { t }), c);
+            } else {
+                throw new Exception("don't know how to cope: " + c.getName() + " <- " + t.toPrettyString());
+            }
+            return Reflection.rebuild(o, c);
+        }
+        private static Object build2(Tree<Object> t, Class c) throws Exception {
+            System.out.println("** build2 " + c.getName() + " " + t.toPrettyString());
+            if (!Reflection.isConcrete(c)) {
+                Field f = c.getField("subclasses");
+                if (f==null) throw new Exception("don't know how to cope: " + c.getName() + " <- " + t.toPrettyString());
+                Class[] subs = (Class[])f.get(null);
+                OUTER: for(int i=0; i<subs.length; i++) {
+                    for(Tree<Object> t2 : t) {
+                        Object o2 = t2.head();
+                        System.out.println("checking  " + o2 + " in " + subs[i].getName());
+                        if (o2 instanceof FieldMark) {
+                            if (subs[i].getField(((FieldMark)o2).field)==null) continue OUTER;
+                        }
+                    }
+                    c = subs[i];
+                    break;
+                }
+            }
+            Object o = c.newInstance();
+            for(Tree<Object> t2 : t) {
+                Object o2 = t2.head();
+                if (o2 instanceof FieldMark) {
+                    FieldMark f = (FieldMark)o2;
+                    Field field = c.getField(ReflectiveWalker.mangle(f.field));
+                    Object tgt = build(t2.child(0), field.getType());
+                    System.out.println("setting " + f.field +
+                                       " on a " + o.getClass().getName() +
+                                       " to " + (tgt==null?"null":tgt.getClass().getName()));
+                    field.set(o, tgt);
+                }
+            }
+            System.out.println("returning a " + o.getClass().getName());
+            return o;
+        }
+        public static Object build(Tree<Object> t) throws Exception {
+            Object h = t.head();
+            if (h instanceof ClassMark) {
+                ClassMark cm = (ClassMark)h;
+                Class c = Class.forName(JavaGrammar.class.getName() + "$" + ReflectiveWalker.mangle(cm.clazz));
+                return build2(t, c);
+            }
+            
+            return h==null ? null : h.toString();
+        }
+        
+        public static interface Expr {
+            public static Class[] subclasses = new Class[] { _plus_.class, num.class };
+        }
+        public static class _plus_ implements Expr {
+            public Expr left;
+            public Expr right;
+            public String toString() { return left + "+" + right; }
+        }
+        public static class num implements Expr {
+            public String val;
+            public String toString() { return "["+val+"]"; }
+        }
+
+    }
+    */
     private static String pad(int i,String s) { return s.length() >= i ? s : pad(i-1,s)+" "; }
 }