X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=0ba0548f0bf0d66bad05e77de660c9b9ba1e60c5;hp=c9d588d9f2962181bc1b7debfa8120a8b19a1726;hb=c1519a9645e80f123c485a15931b193a22140184;hpb=bc7ff8b63529e420f7caa244d3bf74471f55cb7b diff --git a/tests/meta.g b/tests/meta.g index c9d588d..0ba0548 100644 --- a/tests/meta.g +++ b/tests/meta.g @@ -10,7 +10,8 @@ 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 ^"/" e /ws sequence ::= psx @@ -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