X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=tests%2Fmeta.g;h=349be330fb6f69577a6aee8ce71ed8fd7c5113b9;hb=e94712936f420a315c2a1db2c2e9e838c58a35cc;hp=7dff3eb8801cc44f963383d2d3a7199d085f1ce2;hpb=028c0419378758379cef3b058f5b0cb9ff9639fc;p=sbp.git diff --git a/tests/meta.g b/tests/meta.g index 7dff3eb..349be33 100644 --- a/tests/meta.g +++ b/tests/meta.g @@ -4,7 +4,7 @@ NonTerminal ::= word ^"::=" RHS /ws w ::= " " | "\n" | "\r" ws ::= w** => () - | w** "//" (~[\n]*) "\n" ws => () + | w** "//" ~[\n]* "\n" ws => () wp ::= w++ RHS ::= (Conjuncts +/ (!ws "|" !ws)) +/ (!ws ">" !ws) @@ -36,10 +36,14 @@ e ::= word => "nonTerminal" | ^"{" Sequence "}" /ws | ^"[" Range* "]" - | (e ^"++" /ws > e ^"+" /ws) - | (e ^"++/" e /ws > e ^"+/" e /ws) - | (e ^"**" /ws > e ^"*" /ws) - | (e ^"**/" e /ws > e ^"*/" e /ws) + | e ^"++" /ws -> ~[/] + | e ^"+" /ws -> ~[+] + | e ^"++/" e /ws + | e ^"+/" e /ws + | e ^"**" /ws -> ~[/] + | e ^"*" /ws -> ~[*] + | e ^"**/" e /ws + | e ^"*/" e /ws | ^"!" e /ws | e ^"?" /ws