X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FRegressionTests.java;h=5a86bf1c9f6e9f51f76630c90ebbed3adecd7b63;hp=ebe29c47400e32637c5f9c1961e7cbcc9d917216;hb=3e081692a4a7f1a3333f8846a525f71c4543922e;hpb=77d1e5fd29be1ca529e71a4c011f5edea61588e8

diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java
index ebe29c4..5a86bf1 100644
--- a/src/edu/berkeley/sbp/misc/RegressionTests.java
+++ b/src/edu/berkeley/sbp/misc/RegressionTests.java
@@ -2,9 +2,8 @@ package edu.berkeley.sbp.misc;
 import java.io.*;
 import java.util.*;
 import edu.berkeley.sbp.*;
-import edu.berkeley.sbp.*;
 import edu.berkeley.sbp.misc.*;
-import edu.berkeley.sbp.*;
+import edu.berkeley.sbp.tib.*;
 
 public class RegressionTests {
 
@@ -70,10 +69,14 @@ public class RegressionTests {
     }
 
     public static class TestCase {
+        private final Token.Stream inp;
         public final String input;
         public final String[] output;
         public final Union grammar;
-        public TestCase(String input, String[] output, 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+"\": ":"");
             this.input = input;
             this.output = output;
             this.grammar = grammar;
@@ -85,8 +88,7 @@ public class RegressionTests {
             return ret;
         }
         public boolean execute() throws Exception {
-            Forest<String> res = new Parser(grammar,
-                                            CharToken.top()).parse(new CharToken.Stream(new StringReader(input), input.indexOf('\n')==-1?"\""+input+"\": ":""));
+            Forest<String> res = new Parser(grammar, CharToken.top()).parse(inp);
             Collection<Tree<String>> results = res==null ? new HashSet<Tree<String>>() : res.expand(false);
             System.out.print("\r");
             if (results.size() == 0 && output.length > 0) {
@@ -97,7 +99,7 @@ public class RegressionTests {
                 System.out.println("\r                                                                                                              \r");
             }
             HashSet<String> outs = new HashSet<String>();
-            for(String s : output) outs.add(s.trim());
+            if (output != null) for(String s : output) outs.add(s.trim());
             boolean bad = false;
             for (Tree<String> r : results) {
                 String s = r.toString().trim();
@@ -123,13 +125,20 @@ 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); }
+        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 ("testcase".equals(tag)) {
-                if (args.length==2) return testcase((String)args[0], new String[0], (Union)args[1]); 
-                return testcase((String)args[0], (String[])args[1], (Union)args[2]); }
-            else if ("grammar".equals(tag)) return done("s");
+            if ("grammar".equals(tag)) {
+                //System.out.println("\n" + this + "\n");
+                return done("s");
+            }
             else return super.walk(tag, args);
         }
     }