X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Ftestcase.g;h=061bfe9cb62cadbafe70a10e23fb3692e006c5cf;hp=75380bde16492ddfba7ed75d756ac472be724bf8;hb=87bf9df44b553d0e5fb1465983b0dc9f90b699b0;hpb=ebb5fe5647046306f415e31e4967b23169c9004e

diff --git a/tests/testcase.g b/tests/testcase.g
index 75380bd..061bfe9 100644
--- a/tests/testcase.g
+++ b/tests/testcase.g
@@ -1,9 +1,6 @@
-ts       ::= ws tests ws => ts
-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
+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