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

diff --git a/tests/testcase.g b/tests/testcase.g
index 8bb684c..061bfe9 100644
--- a/tests/testcase.g
+++ b/tests/testcase.g
@@ -1,11 +1,6 @@
-ts         = ts:: !ws tests !ws
+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
+test       =   tca::   "testcase" "{" input (o::(output +/ ws))   (grammaro::Grammar) "}" /ws
+           |   tcb::   "testcase" "{" input                       (grammaro::Grammar) "}" /ws
+output     =           "output" Quoted ";" /ws
+input      =           "input"  Quoted ";" /ws