X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Ftestcase.g;h=2491600ea0eb3e8536accef2298615ea5dec7fc8;hp=b1321b14baf7e55d44156ccb0747c2624dfded89;hb=c8d1c3a25e2bfa9645c4b91d3dde9c4857f636f2;hpb=7d1d5b9e2969e687cc07592f5a212681f8d26479

diff --git a/tests/testcase.g b/tests/testcase.g
index b1321b1..2491600 100644
--- a/tests/testcase.g
+++ b/tests/testcase.g
@@ -1,10 +1,9 @@
-ts         = ts:: !ws tests !ws
+#import meta.g as grammar
+
+ws         = grammar.ws
+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" grammar.Quoted ";" /ws
+input      =           "input"  grammar.Quoted ";" /ws