X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=tests%2Ftestcase.g;h=061bfe9cb62cadbafe70a10e23fb3692e006c5cf;hb=f56263f0f1cf0c01dfbd8ea7bd1ba8a9c6bd8042;hp=34584c91c3fec799fb966e1a973788d66432296e;hpb=61446887e40e11e0a7374e591e6d6c25c922093f;p=sbp.git

diff --git a/tests/testcase.g b/tests/testcase.g
index 34584c9..061bfe9 100644
--- a/tests/testcase.g
+++ b/tests/testcase.g
@@ -1,9 +1,6 @@
-ts         = ts:: !ws tests !ws
+ts         = ts:: ws! tests ws!
 tests      =      test */ ws
-ws         =      w*
-test       =      ^"testcase" "{" input output +/ ws   Grammar "}" /ws
-           |      ^"testcase" "{" input                Grammar "}" /ws
-           |      ^"tibcase"  "{" input output +/ ws   Grammar "}" /ws
-           |      ^"tibcase"  "{" input                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