X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=tests%2Ftestcase.g;h=ba23723dbf59c3405f12cbfcb7c9bb00438db2ac;hb=8abe88ea7a5d7b1fc20c45b05e6397dad81e7cdb;hp=7245db8e82e7d779a82c3703805137b00457d9ee;hpb=2a43edc3783a51c0ada2269835d833fa4ce8ab33;p=sbp.git

diff --git a/tests/testcase.g b/tests/testcase.g
index 7245db8..ba23723 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+ Grammar "}"
-           | ^"testcase" "{" Input         Grammar "}"
-output   ::= "output" quoted ";" / w*
-Input    ::= "input"  quoted ";"
+ts         = ts:: !ws tests !ws
+tests      =      test */ ws
+test       =   tca::   "testcase" "{" input (o::(output +/ ws))   (grammaro::(grammar::Grammar)) "}" /ws
+           |   tcb::   "testcase" "{" input                       (grammaro::(grammar::Grammar)) "}" /ws
+output     =           "output" Quoted ";" /ws
+input      =           "input"  Quoted ";" /ws