X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=f709a77bddf1564ba243bb56a6f4a23d185cef8e;hp=a0585bdf4014b72757047e3370a4f22e4d7f7254;hb=be24ec463cd9a9a4f907c5a6167d8029726753ea;hpb=8eaf1ed0aa03013b3547c183adfd9352f845073c diff --git a/tests/meta.g b/tests/meta.g index a0585bd..f709a77 100644 --- a/tests/meta.g +++ b/tests/meta.g @@ -9,13 +9,13 @@ equiAlt ::= conjuncts +/ (ws "|" ws) => "alternatives" sequence ::= es > es ws ^"/" e -es ::= e %% (w**) +es ::= e */ (w**) ss ::= es | es ^"/" e /ws conjuncts ::= rewrite - | rewrite ^"&" e%%ws /ws - | rewrite ^"&~" e%%ws /ws + | rewrite ^"&" e*/ws /ws + | rewrite ^"&~" e*/ws /ws rewrite ::= sequence /ws => "rewrite" | sequence ^"=>" word /ws @@ -25,16 +25,14 @@ rewrite ::= sequence /ws => "rewrite" ec ::= [~\-\]\\\~] | escaped -range ::= ec => "range0" - | ec ^"-" ec => "range1" +range ::= ec => "range" + | ec ^"-" ec e ::= word => "nonTerminalY" | [(][)] => "epsilon" | ^"{" alternatives "}" /ws - | "[" (range*) "]" => "range" - | "[~" (range*) "]" => "rangex" - | e ^"%%" e /ws - | e ^"$$" e /ws + | "[" (range*) "]" => "ranges" + | "[~" (range*) "]" => "rangesx" | e ^"+/" e /ws | e ^"*/" e /ws | e ^"?" /ws