X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FRegressionTests.java;h=6fd3dd0df09546babf75aa4d52090bb03cd1c5d6;hp=b31d5c31bba0f6fe13a001dec864c5de126c9dad;hb=dc9bb3a45ed306e2e35549076842b3e74efecb48;hpb=95c87aa402977de2b96c48bd14c439b46ad49777

diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java
index b31d5c3..6fd3dd0 100644
--- a/src/edu/berkeley/sbp/misc/RegressionTests.java
+++ b/src/edu/berkeley/sbp/misc/RegressionTests.java
@@ -1,20 +1,33 @@
+// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license
+
 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.meta.*;
 import edu.berkeley.sbp.chr.*;
 import edu.berkeley.sbp.util.*;
 
 public class RegressionTests {
 
     public static boolean yes = false;
+    public static boolean graph = false;
+    public static File[] includes = new File[] { new File("tests") };
+
+    public static void main() throws Exception {
+        main(new String[] { "tests/meta.g", "tests/testcase.g", "tests/regression.tc" });
+    }
 
     public static void main(String[] s) throws Exception {
         try {
             boolean profile = false;
+            if (s[0].equals("-graph")) {
+                graph = true;
+                String[] s2 = new String[s.length-1];
+                System.arraycopy(s, 1, s2, 0, s2.length);
+                s = s2;
+            }
             if (s[0].equals("-profile")) {
                 profile = true;
                 String[] s2 = new String[s.length-1];
@@ -22,16 +35,14 @@ public class RegressionTests {
                 s = s2;
             }
 
-            //MetaGrammar mg0 = new MetaGrammar();
-            //mg0.walk(MetaGrammar.meta);
-            //System.out.println(mg0);
-            Tree<String> res = new CharParser(MetaGrammar.make()).parse(new FileInputStream(s[0])).expand1();
-            MetaGrammar mg = (MetaGrammar)new MetaGrammar().walk(res);
-            //System.out.println(mg);
-            Union meta = mg.done();
-            SequenceInputStream sis = new SequenceInputStream(new FileInputStream(s[0]), new FileInputStream(s[1]));
-            res = new CharParser(meta).parse(sis).expand1();
-            Union testcasegrammar = ((MetaGrammar)new MetaGrammar("ts").walk(res)).done("ts");
+            System.err.println("parsing " + s[0]);
+            Tree<String> res = new CharParser(MetaGrammar.newInstance()).parse(new FileInputStream(s[0])).expand1();
+            Union meta = GrammarBuilder.buildFromAST(res, "s", includes);
+
+            System.err.println("parsing " + s[1]);
+            res = new CharParser(meta).parse(new FileInputStream(s[1])).expand1();
+
+            Union testcasegrammar = GrammarBuilder.buildFromAST(res, "s", includes);
             if (testcasegrammar==null) return;
             CharParser parser = new CharParser(testcasegrammar);
 
@@ -41,6 +52,7 @@ public class RegressionTests {
             }
             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");
@@ -49,7 +61,11 @@ public class RegressionTests {
                 System.in.read();
                 System.exit(0);
             }
-            for(TestCase tc : (TestCase[])new TestCaseBuilder().walk(r2.expand1())) tc.execute();
+            System.err.println("expanding...");
+
+            TestCase[] expanded = (TestCase[])new GrammarBuilder(includes, "").walkChildren(r2.expand1());
+            for(TestCase tc : expanded)
+                tc.execute();
 
         } catch (Throwable t) {
             System.err.println("\n\nexception thrown, class == " + t.getClass().getName());
@@ -63,14 +79,18 @@ public class RegressionTests {
     public static class TestCase {
         private final boolean tib;
         private final boolean jav;
-        public final String input;        
+        public /*final*/ String input;        
         public final String[] output;
         public final Union grammar;
-        public TestCase(String input, String[] output, Union grammar, boolean tib, boolean jav) throws IOException {
+        public final String name;
+
+        public TestCase(String name, String input, String[] output,
+                        Union grammar, boolean tib, boolean jav) {
             this.tib = tib;
+            this.name = name;
             this.jav = jav;
             this.input = input;
-            this.output = output;
+            this.output = output==null ? new String[0] : output;
             this.grammar = grammar;
         }
         public String toString() {
@@ -80,28 +100,39 @@ public class RegressionTests {
             return ret;
         }
         public boolean execute() throws Exception {
-            if (jav) {
-                Tree<Object> tree = new CharParser(grammar).parse(new StringReader(input)).expand1();
-                System.out.println(tree);
-                System.out.println(JavaGrammar.build(tree));
-                return true;
-            }
             Forest<String> res = null;
             ParseFailed pfe = null;
+            CharParser parser = new CharParser(grammar);
+            System.out.print("     "+name+"\r");
+            //parser.helpgc = false;
             try {
                 res = tib 
                     ? /*new CharParser(grammar).parse(new Tib(input))*/ null
-                : new CharParser(grammar).parse(new StringReader(input));
+                : parser.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);
+
+            if (graph) {
+                FileOutputStream fos = new FileOutputStream("out.dot");
+                PrintWriter p = new PrintWriter(new OutputStreamWriter(fos));
+                GraphViz gv = new GraphViz();
+                res.toGraphViz(gv);
+                gv.dump(p);
+                p.flush();
+                p.close();
+                System.out.println(parser);
+            }
+
+            Iterable<Tree<String>> results =
+                res==null ? new HashSet<Tree<String>>() : res.expand();
+
             System.out.print("\r");
-            if (results.size() == 0 && output.length > 0) {
+            if (results == null || (!results.iterator().hasNext() && (output!=null && output.length > 0))) {
                 System.out.print("\033[31m");
-                System.out.println("PARSE FAILED");
-                System.out.print("\033[0m");
+                System.out.print("FAIL ");
+                System.out.println("\033[0m "+name);
                 if (pfe != null) pfe.printStackTrace();
             } else {
                 System.out.print("\r                                                                                                              \r");
@@ -127,122 +158,22 @@ public class RegressionTests {
                 System.out.println("\033[0m");
                 return true;
             }             
-            System.out.println("\r\033[32mPASS\033[0m                                                                              ");
+            System.out.println("\r\033[32mPASS\033[0m "+name);
+
             return false;
         }
     }
 
-    public static class TestCaseBuilder extends MetaGrammar {
-        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 ("javacase".equals(tree.head()) || "tibcase".equals(tree.head()) || "testcase".equals(tree.head())) {
-                    String input = string(tree.child(0));
-                    String[] output = tree.numChildren()>2 ? ((String[])walk(tree, 1)) : new String[0];
-                    boolean tib = "tibcase".equals(tree.head());
-                    boolean jav = "javacase".equals(tree.head());
-                    MetaGrammar gram = jav ? new JavaGrammar() : 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, jav);
-                } else if ("ts".equals(tree.head())) return walk(tree, 0);
-                else return super.walk(tree);
-            } catch (Exception e) {
-                throw new Error(e);
-            }
-        }
+    private static String pad(int i,String s) { return s.length() >= i ? s : pad(i-1,s)+" "; }
+    public static String string(Tree<String> tree) {
+        String ret = "";
+        if (tree.head()!=null) ret += tree.head();
+        ret += string(tree.children());
+        return ret;
     }
-
-    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+"]"; }
-        }
-
+    public static String string(Iterable<Tree<String>> children) {
+        String ret = "";
+        for(Tree<String> t : children) ret += string(t);
+        return ret;
     }
-
-    private static String pad(int i,String s) { return s.length() >= i ? s : pad(i-1,s)+" "; }
 }
-