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

diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java
index ebe29c4..96c2075 100644
--- a/src/edu/berkeley/sbp/misc/RegressionTests.java
+++ b/src/edu/berkeley/sbp/misc/RegressionTests.java
@@ -97,7 +97,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 +123,11 @@ 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) { return new TestCase(input, output,        grammar); }
+        public TestCase testcase(String input,                  Union grammar) { return new TestCase(input, new String[0], grammar); }
         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)) return done("s");
             else return super.walk(tag, args);
         }
     }