X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=e4a2518c2555cc660787b619d9c7174183bf2582;hp=02618abf9de083e27a45c796ec9dbde3697a4e25;hb=d79a5062fbe0211d0ad3459d6a545a5270f6efbd;hpb=f7301c48e0bfb173e837f53d9aa8f30130974807

diff --git a/tests/meta.g b/tests/meta.g
index 02618ab..e4a2518 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,11 +1,11 @@
 s         ::=  ws grammar ws                  => "gram"
 ws       !::=  w**
-grammar   ::=  r +/ ws => "grammar"
+grammar   ::=  r +/ ws                        => "grammar"
 r         ::=  word  ^"::=" alternatives /ws
             |  word ^"!::=" alternatives /ws
 
 alternatives  ::=  equiAlt   +/ (ws ">" ws)
-equiAlt       ::=  conjuncts +/ (ws "|" ws)          => "alternatives"
+equiAlt       ::=  conjuncts +/ (ws "|" ws)   => "alternatives"
 
 sequence    ::= es
               > es ws ^"/" e
@@ -29,25 +29,24 @@ range    ::= ec          => "range"
            | ec ^"-" ec
 
 e        ::= word                             => "nonTerminalY"
-           |    [(][)] => "epsilon"
+           |    [(][)]                        => "epsilon"
            |    ^"{" alternatives "}"   /ws
            |    ^"["  (range*) "]"
            |    ^"[~" (range*) "]"
-           |  e ^"+/" e                 /ws
-           |  e ^"*/" e                 /ws
-           |  e ^"?"                    /ws
+           |    ^"^" quoted             /ws
            |  e ^"~/~"                  /ws
-
-           |  e ^"-"  e                 /ws
-
            |    ^"!" e                  /ws
-           |    ^"^" quoted             /ws
+
            |    ^"`" e                  /ws
            |  e ^"#"                    /ws
-           |  quoted                        => "literal"
 
            |  (e ws ^"**" > e ws ^"*")
+           |  e ^"*/" e                 /ws
            |  (e ws ^"++" > e ws ^"+")
+           |  e ^"+/" e                 /ws
+           |  e ^"?"                    /ws
+
+           |  quoted                        => "literal"
 
            |     "(" word ^")"          /ws
            >    ^"(" alternatives ")"   /ws
@@ -57,7 +56,7 @@ w       !::= " "
            | "\n"
            | "\r"
 an       ::= [a-zA-Z0-9_]
-word     ::= an++                           => "sify"
+word     ::= an++
 quoted   ::= "\"" (([~\"\\] | escaped)*) "\"" => "sify"
 escaped  ::= "\\n" => "\n"
            | "\\r" => "\r"