X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Ftestcase.g;h=b25251d24a1e2616aa085099874f351e0ab137d1;hp=8bb684cb1fa86de9a4f9041028755614fe3313e9;hb=a61c67f0e574923f63bc939a79b5e9714a87a123;hpb=45d799349e635f1a99e3974e4504a43d5a7aaf33

diff --git a/tests/testcase.g b/tests/testcase.g
index 8bb684c..b25251d 100644
--- a/tests/testcase.g
+++ b/tests/testcase.g
@@ -1,11 +1,12 @@
-ts         = ts:: !ws tests !ws
-tests      =      test */ ws
-ws         =      w*
-test       =      ^"testcase" "{" input output +/ ws   (grammar::Grammar) "}" /ws
-           |      ^"testcase" "{" input                (grammar::Grammar) "}" /ws
-           |      ^"tibcase"  "{" input output +/ ws   (grammar::Grammar) "}" /ws
-           |      ^"tibcase"  "{" input                (grammar::Grammar) "}" /ws
-           |      ^"javacase"  "{" input output +/ ws   (grammar::Grammar) "}" /ws
-           |      ^"javacase"  "{" input                (grammar::Grammar) "}" /ws
-output     =      ^"output" Quoted ";" /ws
-input      =      "input"  Quoted ";" /ws
+#import ../src/edu/berkeley/sbp/meta/meta.g as grammar
+// this is a testx
+s          = ws! (TestCases:: TestCase */ ws) ws!
+Input      = "input"  grammar.Quoted ";" /ws
+Output     = "output" grammar.Quoted ";" /ws
+Outputs::  = Output */ ws
+TestCase:: = "testcase" grammar.Quoted "{"
+                     Input
+                     (^"ignore output;" | Outputs)
+                     (SubGrammar:: grammar.Grammar)
+                "}" /ws
+ws         = grammar.ws