From b194da7e8cc5bd13e03d59008c34deefc4e15764 Mon Sep 17 00:00:00 2001 From: adam Date: Tue, 13 Dec 2005 02:27:06 -0500 Subject: [PATCH] checkpoint darcs-hash:20051213072706-5007d-e01306ebfe23ffd63b21eef74cc8886b0e93b715.gz --- tests/meta.g | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/tests/meta.g b/tests/meta.g index 138ec62..55bc02a 100644 --- a/tests/meta.g +++ b/tests/meta.g @@ -10,8 +10,8 @@ alternatives ::= equiAlt +/ (ws ">" ws) equiAlt ::= conjuncts +/ (ws "|" ws) => "alternatives" sequence ::= Es - > Es ^"/" E /ws -Es ::= E+ + > Es ^"/" e /ws +Es ::= e+ //es ::= E+/ws conjuncts ::= rewrite @@ -24,28 +24,28 @@ rewrite ::= sequence /ws => "rewrite" | sequence "=>" "()" /ws => "wrap" range ::= ec => "range0" | ec ^"-" ec => "range0" -E ::= word => "nonTerminalY" +e ::= word => "nonTerminalY" | [(][)] => "epsilon" - | ^"{" alternatives "}" + | ^"{" alternatives "}" /ws | "[" [\~]? range* "]" => "range" - | E ^"*/" E - | E ^"+/" E - | E ^"?" - | E ^"~/~" + | e ^"*/" e /ws + | e ^"+/" e /ws + | e ^"?" /ws + | e ^"~/~" /ws - | E ^"-" E + | e ^"-" e /ws - | ^"!" E - | "^" quoted => "care" - | ^"`" E - | E ^"#" + | ^"!" e /ws + | "^" quoted /ws => "care" + | ^"`" e /ws + | e ^"#" /ws | quoted => "literal" - | (E ^"**" > E ^"*") - | (E ^"++" > E ^"+") + | (e ws ^"**" > e ws ^"*") + | (e ws ^"++" > e ws ^"+") - | "(" word ^")" - > ^"(" alternatives ")" + | "(" word ^")" /ws + > ^"(" alternatives ")" /ws w !::= " " | "//" [~\n]* "\n" -- 1.7.10.4