X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FRegressionTests.java;h=13be93f254169f0f0162a20d5896b8788f48f56f;hp=b97256439397b60c960a6da5deda2733bb1ca30d;hb=f17fca21d99030d325624f839efcd17bc93f1548;hpb=d62f06aa2411dab1830020f731a83abeef24abd3

diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java
index b972564..13be93f 100644
--- a/src/edu/berkeley/sbp/misc/RegressionTests.java
+++ b/src/edu/berkeley/sbp/misc/RegressionTests.java
@@ -1,17 +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];
@@ -19,18 +35,16 @@ public class RegressionTests {
                 s = s2;
             }
 
-            //MetaGrammar mg0 = new MetaGrammar();
-            //mg0.walk(MetaGrammar.meta);
-            //System.out.println(mg0);
-            Tree<String> res = new CharToStringParser(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 CharToStringParser(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 = GrammarAST.buildFromAST(res, "s", includes);
+
+            System.err.println("parsing " + s[1]);
+            res = new CharParser(meta).parse(new FileInputStream(s[1])).expand1();
+
+            Union testcasegrammar = GrammarAST.buildFromAST(res, "s", includes);
             if (testcasegrammar==null) return;
-            CharToStringParser parser = new CharToStringParser(testcasegrammar);
+            CharParser parser = new CharParser(testcasegrammar);
 
             if (profile) {
                 System.out.println("\nready...");
@@ -38,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");
@@ -46,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 GrammarAST(includes, "").walkChildren(r2.expand1());
+            for(TestCase tc : expanded)
+                tc.execute();
 
         } catch (Throwable t) {
             System.err.println("\n\nexception thrown, class == " + t.getClass().getName());
@@ -59,13 +78,19 @@ public class RegressionTests {
 
     public static class TestCase {
         private final boolean tib;
-        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 {
+        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() {
@@ -77,20 +102,37 @@ 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");
+            //parser.helpgc = false;
             try {
                 res = tib 
-                ? new CharToStringParser(grammar).parse(new Tib(input))
-                : new CharToStringParser(grammar).parse(new StringReader(input));
+                    ? /*new CharParser(grammar).parse(new Tib(input))*/ null
+                : 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");
@@ -116,32 +158,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;
+    }
 }
-