X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Ftestcase.g;h=b25251d24a1e2616aa085099874f351e0ab137d1;hp=5212e91edd0805067a6732e84f73ee0338678d2b;hb=HEAD;hpb=bc2858abab718e5c3d0cf07c4f18f353f57832e6

diff --git a/tests/testcase.g b/tests/testcase.g
index 5212e91..b25251d 100644
--- a/tests/testcase.g
+++ b/tests/testcase.g
@@ -1,8 +1,12 @@
-#import tests/meta.g
-
-ts         = ts:: ws! tests ws!
-tests      =      test */ ws
-test       =   tca::   "testcase" "{" input (o::(output +/ ws))   (grammaro::Grammar) "}" /ws
-           |   tcb::   "testcase" "{" input                       (grammaro::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