X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=tests%2Ftestcase.g;h=cc6fd20ee041ab0e50c059a560df5c0ca5f651e0;hb=cdc2e39d13b27a1e0e9a94d797d71e7db3bc6258;hp=33c00b7ced65eca4535330defdf8516e6ed8cbc6;hpb=107df9a4aee6ba593b64d3bbe8b2efac84596cad;p=sbp.git

diff --git a/tests/testcase.g b/tests/testcase.g
index 33c00b7..cc6fd20 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