X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FRegressionTests.java;h=75f2368b1300de2505383949709d5a9746e4b2e6;hp=67152b64206bb567b2add02bc7e2d1ae0134a9b1;hb=574d2f85990e11f0a45e9028fbadf08aaedfd93a;hpb=2724e3d1df836f6ce40bc4227f1509e777de2e48

diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java
index 67152b6..75f2368 100644
--- a/src/edu/berkeley/sbp/misc/RegressionTests.java
+++ b/src/edu/berkeley/sbp/misc/RegressionTests.java
@@ -73,12 +73,10 @@ public class RegressionTests {
         public final String input;
         public final String[] output;
         public final Union grammar;
-        public TestCase(String input, String[] output, Union grammar, boolean tib) {
+        public TestCase(String input, String[] output, Union grammar, boolean tib) throws IOException {
             this.inp = tib
-                ? new CharToken.Stream(new StringReader(input), input.indexOf('\n')==-1?"\""+input+"\": ":"")
-                /*: new TibCharToken.Stream(new StringReader(input))*/
-                : new CharToken.Stream(new StringReader(input), input.indexOf('\n')==-1?"\""+input+"\": ":"")
-                ;
+                ? new Tib(input)
+                : new CharToken.Stream(new StringReader(input), input.indexOf('\n')==-1?"\""+input+"\": ":"");
             this.input = input;
             this.output = output;
             this.grammar = grammar;
@@ -127,13 +125,24 @@ public class RegressionTests {
     public static class TestCaseBuilder extends MetaGrammar {
         public TestCase[] ts(Object o1, TestCase[] ts, Object o2) { return ts; }
         public TestCase[] ts(TestCase[] ts) { return ts; }
-        public TestCase testcase(String input, String[] output, Union grammar) { return new TestCase(input, output,        grammar, false); }
-        public TestCase testcase(String input,                  Union grammar) { return new TestCase(input, new String[0], grammar, false); }
-        public TestCase  tibcase(String input,                  Union grammar) { return new TestCase(input, new String[0], grammar, false); }
+        public TestCase testcase(String input, String[] output, Union grammar) throws IOException {
+            return new TestCase(input, output,        grammar, false); }
+        public TestCase testcase(String input,                  Union grammar) throws IOException {
+            return new TestCase(input, new String[0], grammar, false); }
+        public TestCase tibcase(String input, String[] output, Union grammar) throws IOException {
+            return new TestCase(input, output,        grammar, true); }
+        public TestCase  tibcase(String input,                  Union grammar) throws IOException {
+            return new TestCase(input, new String[0], grammar, true); }
         public MetaGrammar grammar(Object[] o) { return this; }
-        public Object walk(String tag, Object[] args) {
-            if ("grammar".equals(tag)) return done("s");
-            else return super.walk(tag, args);
+        /*
+        public Object walk(Tree<String> tree) {
+            if ("grammar".equals(tree.head())) return done("s");
+            else return super.walk(tree);
+        }
+        */
+        public Object walk(String head, Object[] args) {
+            if ("grammar".equals(head)) return done("s");
+            else return super.walk(head, args);
         }
     }