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

diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java
index dc52644..6fd3dd0 100644
--- a/src/edu/berkeley/sbp/misc/RegressionTests.java
+++ b/src/edu/berkeley/sbp/misc/RegressionTests.java
@@ -1,18 +1,23 @@
+// 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.*;
-import static edu.berkeley.sbp.misc.Demo.*;
 
 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 {
@@ -31,13 +36,13 @@ public class RegressionTests {
             }
 
             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");
+            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]);
-            SequenceInputStream sis = new SequenceInputStream(new FileInputStream(s[0]), new FileInputStream(s[1]));
-            res = new CharParser(meta).parse(sis).expand1();
+            res = new CharParser(meta).parse(new FileInputStream(s[1])).expand1();
 
-            Union testcasegrammar = Demo.make(res, "ts", new TestCaseMaker());
+            Union testcasegrammar = GrammarBuilder.buildFromAST(res, "s", includes);
             if (testcasegrammar==null) return;
             CharParser parser = new CharParser(testcasegrammar);
 
@@ -58,25 +63,9 @@ public class RegressionTests {
             }
             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) {
+            TestCase[] expanded = (TestCase[])new GrammarBuilder(includes, "").walkChildren(r2.expand1());
+            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());
@@ -87,46 +76,18 @@ 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 boolean tib;
         private final boolean jav;
         public /*final*/ String input;        
         public final String[] output;
         public final Union grammar;
+        public final String name;
 
-        public TestCase(String input, String[] output, Union grammar, boolean tib, boolean jav) throws IOException {
+        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==null ? new String[0] : output;
@@ -142,6 +103,7 @@ public class RegressionTests {
             Forest<String> res = null;
             ParseFailed pfe = null;
             CharParser parser = new CharParser(grammar);
+            System.out.print("     "+name+"\r");
             //parser.helpgc = false;
             try {
                 res = tib 
@@ -162,12 +124,15 @@ public class RegressionTests {
                 p.close();
                 System.out.println(parser);
             }
-            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 == null || (results.size() == 0 && (output!=null && 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");
@@ -193,37 +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 StringWalker {
-        public Object walk(Tree<String> tree) {
-            try {
-                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];
-                    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 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)+" "; }
+    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;
+    }
 }
-