X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Ftestcase.g;h=cc6fd20ee041ab0e50c059a560df5c0ca5f651e0;hp=8eb36f0e8659debccb6fba84e254265c1b0b173c;hb=bad286576656a73e315f0aa7b08a1c1714eb8390;hpb=5e8e3c98f80fd61cc4f427c4984cb497bab0f6fc

diff --git a/tests/testcase.g b/tests/testcase.g
index 8eb36f0..cc6fd20 100644
--- a/tests/testcase.g
+++ b/tests/testcase.g
@@ -1,7 +1,6 @@
-ts       ::= ws Ts ws => ts
-Ts       ::= test*
-ws      !::= w*
-test     ::= ^"testcase" "{" input output+/ws   Grammar "}" /ws
-           | ^"testcase" "{" 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