projects
/
sbp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
ebe29c4
..
96c2075
100644
(file)
--- 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>();
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();
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 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) {
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);
}
}
else return super.walk(tag, args);
}
}