X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=f9e0e67830ed7d37a41b24b27e42e8006c946a49;hp=5347aebd5d37902dc45092f02c215cf4352d2753;hb=93ea8e84f6eadb1b2549754bbb832c75e4730e86;hpb=641b6188852cc3ed3373011a76032c42b5806a95

diff --git a/tests/meta.g b/tests/meta.g
index 5347aeb..f9e0e67 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,60 +1,54 @@
-s         ::=  ws Grammar ws                  => "gram"
+s         ::=  ws grammar ws                  => "gram"
 ws       !::=  w**
-grammar   ::=  R+/ws => "grammar"
-Grammar   ::=  R+ => "grammar"
-R         ::=  word  ^"::=" Alternatives
-            |  word ^"!::=" Alternatives
-
-ec        ::=  [~\]\\\-\~] | escaped
-
-Alternatives  ::=  EquiAlt   +/ ">"
-EquiAlt       ::=  Conjuncts +/ "|"                 => "alternatives"
-
-sequence    ::= Es
-              > Es ^"/" E   /ws
-Es          ::= E+
-//es          ::= E+/ws
-
-Conjuncts   ::=  rewrite
-              |  rewrite ^"&"  sequence
-              |  rewrite ^"&~" sequence
-
-rewrite  ::=  sequence                  /ws        => "rewrite"
-           |  sequence ^"=>" word       /ws
-           |  sequence ^"=>" quoted     /ws
-           |  sequence  "=>" "()"       /ws        => "wrap"
-
-range    ::= ec => "range0" | ec ^"-" ec      => "range0"
-E        ::= word                             => "nonTerminalY"
-           |    [(][)] => "epsilon"
-           |    ^"{" Alternatives "}"
-           |     "[" [\~]?  range* "]"        => "range"
-           |  E ^"*/" E
-           |  E ^"+/" E
-           |  E ^"?"
-           |  E ^"~/~"
-
-           |  E ^"-"  E
-
-           |    ^"!" E
-           |     "^" quoted => "care"
-           |    ^"`" E
-           |  E ^"#"
-           |  quoted                        => "literal"
+grammar   ::=  r +/ ws                        => "grammar"
+r         ::=  word  ^"::=" alternatives /ws
+            |  word ^"!::=" alternatives /ws
+
+alternatives  ::=  (conjuncts +/ (ws "|" ws)) +/ (ws ">" ws)
+
+conjuncts   ::=  sequence
+              |  sequence ^"&"  e*/ws   /ws
+              |  sequence ^"&~" e*/ws   /ws
+
+ps          ::= e*/ws => "ps"
+psx         ::= ps
+              > ps ^"/" e /ws
+sequence    ::= psx
+              | psx ^"=>" (word|quoted) /ws
 
-           |  (E ^"**" > E ^"*")
-           |  (E ^"++" > E ^"+")
+ec       ::= [~\-\]\\\~]
+           | escaped
 
-           |     "(" word ^")"
-           >    ^"(" Alternatives ")"
+range    ::= ec          => "range"
+           | ec ^"-" ec
+
+e        ::=  word                          => "nonTerminal"
+           |  quoted                        => "literal"
+           |    ^"()"
+           |    ^"{" sequence "}"       /ws
+           |    ^"["  (range*) "]"
+           |    ^"[~" (range*) "]"
+           |    ^"^" quoted             /ws
+           |    ^"!" e                  /ws
+
+           |  (e ws ^"**" > e ws ^"*")
+           |  e ^"*/" e                 /ws
+           |  (e ws ^"++" > e ws ^"+")
+           |  e ^"+/" e                 /ws
+           |  e ^"?"                    /ws
+
+           |     "(" word         ^")"  /ws
+           >    ^"(" alternatives  ")"  /ws
 
 w       !::= " "
-           | "//" [~\n]* "\n"
+           | "//" ([~\n]*) "\n"
            | "\n"
            | "\r"
-an       ::= [a-zA-Z0-9_]
-word     ::= an++                           => "sify"
-quoted   ::= "\"" ([~\"\\] | escaped)* "\"" => "sify"
+word     ::= [a-zA-Z0-9_]++
+quoted   ::= "\"" (([~\"\\] | escaped)+) "\""
+           | "\"\"" => ""
 escaped  ::= "\\n" => "\n"
            | "\\r" => "\r"
            | "\\" [~nr]
+
+