X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Ftestcase.g;fp=tests%2Ftestcase.g;h=ba23723dbf59c3405f12cbfcb7c9bb00438db2ac;hp=b1321b14baf7e55d44156ccb0747c2624dfded89;hb=ac0f7d32be59d02b1f8d48d2b23232adf8871b46;hpb=3c03a0a1131b46a23ccfdeab2cb4fbd59ee05b7a

diff --git a/tests/testcase.g b/tests/testcase.g
index b1321b1..ba23723 100644
--- a/tests/testcase.g
+++ b/tests/testcase.g
@@ -1,10 +1,6 @@
 ts         = ts:: !ws tests !ws
 tests      =      test */ ws
-test       =      ^"testcase" "{" input output +/ ws   (grammar::Grammar) "}" /ws
-           |      ^"testcase" "{" input                (grammar::Grammar) "}" /ws
-           |      ^"tibcase"  "{" input output +/ ws   (grammar::Grammar) "}" /ws
-           |      ^"tibcase"  "{" input                (grammar::Grammar) "}" /ws
-           |      ^"javacase"  "{" input output +/ ws   (grammar::Grammar) "}" /ws
-           |      ^"javacase"  "{" input                (grammar::Grammar) "}" /ws
-output     =      ^"output" Quoted ";" /ws
-input      =      "input"  Quoted ";" /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