X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FRegressionTests.java;h=eae22d132ffe40f87c62242b34550d391818865c;hp=266e8d5008d9df391ca1e70567d9e3688aee70a1;hb=ffb2106e9497f12c4edb173ef561f9333da6f02c;hpb=a22c5074e705e3ffcf03e9f9d174aed8ef79fc91

diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java
index 266e8d5..eae22d1 100644
--- a/src/edu/berkeley/sbp/misc/RegressionTests.java
+++ b/src/edu/berkeley/sbp/misc/RegressionTests.java
@@ -1,17 +1,41 @@
+// Copyright 2006-2007 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 GrammarAST.ImportResolver resolver = new GrammarAST.ImportResolver() {
+            public InputStream getImportStream(String importname) {
+                try {
+                    return new FileInputStream("tests/"+importname);
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        };
+
+    public static void main() throws Exception {
+        main(new String[] { null, "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];
@@ -19,19 +43,29 @@ public class RegressionTests {
                 s = s2;
             }
 
-            //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.out.println(mg);
-            Union meta = mg.done();
-            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");
+            InputStream metaGrammarStream =
+                s[0] == null
+                ? RegressionTests.class.getClassLoader().getResourceAsStream("edu/berkeley/sbp/meta/meta.g")
+                : new FileInputStream(s[0]);
+            Tree<String> res = new CharParser(GrammarAST.getMetaGrammar()).parse(metaGrammarStream).expand1();
+            Union meta = GrammarAST.buildFromAST(res, "s", resolver);
+            CharParser cp = new CharParser(meta);
+
+            System.err.println("serializing grammar to grammar.ser...");
+            ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream("grammar.ser"));
+            oos.writeObject(cp);
+            oos.close();
+            System.err.println("deserializing grammar from grammar.ser...");
+            ObjectInputStream ois = new ObjectInputStream(new FileInputStream("grammar.ser"));
+            cp = (CharParser)ois.readObject();
+            ois.close();
+
+            System.err.println("parsing " + s[1]);
+            res = new CharParser(meta).parse(new FileInputStream(s[1])).expand1();
+
+            Union testcasegrammar = GrammarAST.buildFromAST(res, "s", resolver);
             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...");
@@ -39,7 +73,8 @@ public class RegressionTests {
             }
             System.gc();
             long now = System.currentTimeMillis();
-            Forest<String> r2 = parser.parse(cs);
+            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) {
@@ -47,7 +82,28 @@ public class RegressionTests {
                 System.in.read();
                 System.exit(0);
             }
-            for(TestCase tc : (TestCase[])new TestCaseBuilder().walk(r2.expand1())) tc.execute();
+            System.err.println("expanding...");
+
+            ArrayList<TestCase> cases = new ArrayList<TestCase>();
+            Tree tt = r2.expand1();
+            for(int i=0; i<tt.size(); i++) {
+                Tree t = tt.child(i);
+                String[] expect = new String[t.child(2).size()];
+                for(int j=0; j<t.child(2).size(); j++)
+                    expect[j] = stringifyChildren(t.child(2).child(j));
+                cases.add(new TestCase(stringifyChildren(t.child(0)),
+                                       stringifyChildren(t.child(1)),
+                                       expect,
+                                       GrammarAST.buildFromAST(t.child(3), "s", resolver),
+                                       false,
+                                       false));
+                
+            }
+            TestCase[] expanded = new TestCase[cases.size()];
+            for(int i=0; i<expanded.length; i++)
+                expanded[i] = cases.get(i);
+            for(TestCase tc : expanded)
+                tc.execute();
 
         } catch (Throwable t) {
             System.err.println("\n\nexception thrown, class == " + t.getClass().getName());
@@ -58,17 +114,28 @@ public class RegressionTests {
         }
     }
 
+    private static String stringifyChildren(Tree t) {
+        StringBuffer sb = new StringBuffer();
+        for(int i=0; i<t.size(); i++) {
+            sb.append(t.child(i).head());
+            sb.append(stringifyChildren(t.child(i)));
+        }
+        return sb.toString();
+    }
+
     public static class TestCase {
-        private final Token.Stream inp;
-        public final String input;
+        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 final String name;
+
+        public TestCase(String name, String input, String[] output,
+                        Union grammar, boolean tib, boolean jav) {
+            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,18 +147,31 @@ public class RegressionTests {
         public boolean execute() throws Exception {
             Forest<String> res = null;
             ParseFailed pfe = null;
+            CharParser parser = new CharParser(grammar);
+            System.out.print("     "+name+"\r");
             try {
-                res = new CharToken.CharToStringParser(grammar).parse(inp);
-            } catch (ParseFailed pf) {
-                pfe = pf;
+                res = parser.parse(new StringReader(input));
+            } catch (ParseFailed pf) { pfe = pf; }
+
+            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);
             }
-            //ystem.out.println("res=="+res);
-            Collection<Tree<String>> results = res==null ? new HashSet<Tree<String>>() : res.expand(false);
+
+            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");
@@ -117,32 +197,22 @@ public class RegressionTests {
                 System.out.println("\033[0m");
                 return true;
             }             
-            System.out.println("\r\033[32mPASS\033[0m                                                                              ");
-            return false;
-        }
-    }
+            System.out.println("\r\033[32mPASS\033[0m "+name);
 
-    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 ("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());
-                    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);
-                } else if ("ts".equals(tree.head())) return walk(tree, 0);
-                else return super.walk(tree);
-            } catch (Exception e) {
-                throw new Error(e);
-            }
+            return false;
         }
     }
 
     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 String string(Iterable<Tree<String>> children) {
+        String ret = "";
+        for(Tree<String> t : children) ret += string(t);
+        return ret;
+    }
 }
-