X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FRegressionTests.java;h=dc52644c53851402add20edba07b0499fbf1117d;hb=03e1f20f869819893205ec771571b2c62ab00421;hp=b24702197ea7b6b945d6ac80fbdb630219726dcf;hpb=ebb5fe5647046306f415e31e4967b23169c9004e;p=sbp.git

diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java
index b247021..dc52644 100644
--- a/src/edu/berkeley/sbp/misc/RegressionTests.java
+++ b/src/edu/berkeley/sbp/misc/RegressionTests.java
@@ -1,17 +1,28 @@
 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.*;
+import static edu.berkeley.sbp.misc.Demo.*;
 
 public class RegressionTests {
 
     public static boolean yes = false;
+    public static boolean graph = false;
 
     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 +30,16 @@ 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();
+            System.err.println("parsing " + s[0]);
+            Tree<String> res = new CharParser(Demo.make()).parse(new FileInputStream(s[0])).expand1();
+            Union meta = Demo.make(res, "s");
+            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 = Demo.make(res, "ts", new TestCaseMaker());
             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 +47,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 +56,27 @@ public class RegressionTests {
                 System.in.read();
                 System.exit(0);
             }
-            for(TestCase tc : (TestCase[])new TestCaseBuilder().walk(r2.expand1())) tc.execute();
+            System.err.println("expanding...");
+
+            Tree t = r2.expand1();
+            TestCase[] expanded = (TestCase[])((Demo.Reducer)t.head()).reduce(t.children());
+            System.err.println("executing...");
+            for(TestCase tc : expanded) {
+                tc.execute();
+                /*
+                String st = "a";
+                for(int i=0; i<12; i++) {
+                    //System.out.println("length " + st.length());
+                    tc.input = st;
+                    long nowy = System.currentTimeMillis();
+                    GSS.shifts = 0;
+                    GSS.reductions = 0;
+                    tc.execute();
+                    System.out.println("length " + st.length() + " => " + ((System.currentTimeMillis()-nowy)/1000.0) + " " + GSS.shifts + " " + GSS.reductions);
+                    st = st+st;
+                }
+                */
+            }
 
         } catch (Throwable t) {
             System.err.println("\n\nexception thrown, class == " + t.getClass().getName());
@@ -58,17 +87,49 @@ public class RegressionTests {
         }
     }
 
+    public static class TestCaseMaker extends ReflectiveMeta {
+        public TestCaseMaker() {
+            super(TestCaseMakerHelper.class, new Class[] {
+                     MG.Grammar.class,
+                     MG.NonTerminal.class,
+                     MG.AnonUn.class,
+                     MG.Range.class,
+                     MG.El.class,
+                     MG.Seq.class,
+                     MG.NonTerminalReference.class,
+                     MG.StringLiteral.class,
+                     MG.XTree.class,
+                     MG.CharClass.class
+            });
+        }
+        public static class TestCaseMakerHelper extends MG {
+            public static @tag("grammaro") @raw Object grammaro(Iterable<Tree> t) {
+                System.out.println("working on " + t);
+                return Demo.make(t.iterator().next(), "s", new ReflectiveMetaPlain());
+            }
+            //public static @tag("tca")           Object tca(Object[] o) throws IOException {
+            //return new TestCase((String)o[0], (String[])o[1], (Union)o[2], false, false); }
+            public static @tag("tca")           Object tca(String input, String[] output, Union u) throws IOException {
+                return new TestCase(input, output, u, false, false); }
+            public static @tag("tcb")           Object tca(String input, Union u) throws IOException {
+                return new TestCase(input, new String[0], u, false, false); }
+            public static @tag("ts") TestCase[] go(TestCase[] cases) { return cases; }
+            public static @tag("o") Object o(Object[] s) { return s; }
+        }
+    }
+
     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.output = output==null ? new String[0] : output;
             this.grammar = grammar;
         }
         public String toString() {
@@ -79,15 +140,31 @@ public class RegressionTests {
         }
         public boolean execute() throws Exception {
             Forest<String> res = null;
-            Parser.Failed pfe = null;
+            ParseFailed pfe = null;
+            CharParser parser = new CharParser(grammar);
+            //parser.helpgc = false;
             try {
-                res = new CharToken.CharToStringParser(grammar).parse(inp);
-            } catch (Parser.Failed pf) {
+                res = tib 
+                    ? /*new CharParser(grammar).parse(new Tib(input))*/ null
+                : parser.parse(new StringReader(input));
+            } catch (ParseFailed pf) {
                 pfe = pf;
             }
+            //ystem.out.println("res=="+res);
+
+            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);
+            }
             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");
@@ -117,31 +194,36 @@ public class RegressionTests {
                 return true;
             }             
             System.out.println("\r\033[32mPASS\033[0m                                                                              ");
+
             return false;
         }
     }
 
-    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 ("grammaro".equals(tree.head())) return Demo.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 = Demo.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);
             }
         }
     }
-
     private static String pad(int i,String s) { return s.length() >= i ? s : pad(i-1,s)+" "; }
 }