X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=0ba0548f0bf0d66bad05e77de660c9b9ba1e60c5;hp=cf6a6b378b7f3bdefa7437b536520b120d306445;hb=c1519a9645e80f123c485a15931b193a22140184;hpb=6fc80ede5be0eaca9c3ad20415e386b9baee3273 diff --git a/tests/meta.g b/tests/meta.g index cf6a6b3..0ba0548 100644 --- a/tests/meta.g +++ b/tests/meta.g @@ -10,9 +10,10 @@ conjuncts ::= sequence | sequence ^"&" e*/ws /ws | sequence ^"&~" e*/ws /ws -ps ::= (e*/ ws) => "ps" +ps ::= e*/ws => "ps" + | (e+/ws ws)? "^" quoted (ws e+/ws)? => "ps2" psx ::= ps - | ps ws ^"/" e + > ps ^"/" e /ws sequence ::= psx | psx ^"=>" (word|quoted) /ws @@ -26,10 +27,8 @@ e ::= word => "nonTerminal" | quoted => "literal" | ^"()" | ^"{" sequence "}" /ws - | ^"[" (range*) "]" - | ^"[~" (range*) "]" - | ^"^" quoted /ws - | ^"!" e /ws + | ^"[" range* "]" + | ^"[~" range* "]" | (e ws ^"**" > e ws ^"*") | e ^"*/" e /ws