checkpoint

[sbp.git] / src / edu / berkeley / sbp / misc / RegressionTests.java

diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java
index 0749b7d..6f69ac3 100644 (file)
--- a/src/edu/berkeley/sbp/misc/RegressionTests.java
+++ b/src/edu/berkeley/sbp/misc/RegressionTests.java
@@ -8,7 +8,7 @@ import edu.berkeley.sbp.bind.*;
 import edu.berkeley.sbp.tib.*;
 import edu.berkeley.sbp.chr.*;
 import edu.berkeley.sbp.util.*;
 import edu.berkeley.sbp.tib.*;
 import edu.berkeley.sbp.chr.*;
 import edu.berkeley.sbp.util.*;

-import static edu.berkeley.sbp.misc.Demo.*;
+import static edu.berkeley.sbp.misc.MetaGrammar.*;

 
 public class RegressionTests {
 
 
 public class RegressionTests {
 

@@ -32,13 +32,13 @@ public class RegressionTests {
             }
 
             System.err.println("parsing " + s[0]);
             }
 
             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.make()).parse(new FileInputStream(s[0])).expand1();
+            Union meta = MetaGrammar.make(res, "s");

             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();
 
             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();
 

-            Union testcasegrammar = Demo.make(res, "ts", new TestCaseMaker());
+            Union testcasegrammar = MetaGrammar.make(res, "ts", new TestCaseMaker());

             if (testcasegrammar==null) return;
             CharParser parser = new CharParser(testcasegrammar);
 
             if (testcasegrammar==null) return;
             CharParser parser = new CharParser(testcasegrammar);
 

@@ -106,7 +106,7 @@ public class RegressionTests {
         public static class TestCaseMakerHelper extends MG {
             public static @bind.as("grammaro") @bind.raw Object grammaro(Iterable<Tree> t) {
                 System.out.println("working on " + t);
         public static class TestCaseMakerHelper extends MG {
             public static @bind.as("grammaro") @bind.raw Object grammaro(Iterable<Tree> t) {
                 System.out.println("working on " + t);

-                return Demo.make(t.iterator().next(), "s", new ReflectiveMetaPlain());
+                return MetaGrammar.make(t.iterator().next(), "s", new ReflectiveMetaPlain());

             }
             //public static @bind.as("tca")           Object tca(Object[] o) throws IOException {
             //return new TestCase((String)o[0], (String[])o[1], (Union)o[2], false, false); }
             }
             //public static @bind.as("tca")           Object tca(Object[] o) throws IOException {
             //return new TestCase((String)o[0], (String[])o[1], (Union)o[2], false, false); }

@@ -203,13 +203,13 @@ public class RegressionTests {
     public static class TestCaseBuilder extends StringWalker {
         public Object walk(Tree<String> tree) {
             try {
     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());
+                if ("grammaro".equals(tree.head())) return MetaGrammar.make(tree, "s");
+                else if ("output".equals(tree.head())) return string(tree.children());
+                else if ("input".equals(tree.head())) return string(tree.children());

                 else if ("testcase".equals(tree.head())) {
                 else if ("testcase".equals(tree.head())) {

-                    String input = MetaGrammar.string(tree.child(0));
+                    String input = string(tree.child(0));

                     String[] output = tree.numChildren()>2 ? ((String[])walk(tree, 1)) : new String[0];
                     String[] output = tree.numChildren()>2 ? ((String[])walk(tree, 1)) : new String[0];

-                    Union grammar = Demo.make(tree.child(tree.numChildren()-1), "s");
+                    Union grammar = MetaGrammar.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);
                     TestCase tc = new TestCase(input, output, grammar, false, false);
                     return tc;
                 } else if ("ts".equals(tree.head())) return walk(tree, 0);

@@ -226,5 +226,15 @@ public class RegressionTests {
         }
     }
     private static String pad(int i,String s) { return s.length() >= i ? s : pad(i-1,s)+" "; }
         }
     }
     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;
+    }

 }
 }

-