X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=8a5b7e17f3573d7272e103a720bd40ecaa84aa8e;hp=bb7cd114d94bf05ab028246df247490f0b38e86d;hb=8633a1ff957ac9ccbafa5e897bc8b9f17eadab02;hpb=8ad399319f15cd179fa05a5052314a8f1d7df271

diff --git a/tests/meta.g b/tests/meta.g
index bb7cd11..8a5b7e1 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,19 +1,23 @@
 s         ::=  ws grammar ws                  => "gram"
 ws       !::=  w**
+wp       !::=  w++
 grammar   ::=  r +/ ws                        => "grammar"
+
 r         ::=  word  ^"::=" alternatives /ws
             |  word ^"!::=" alternatives /ws
 
-alternatives  ::=  equiAlt   +/ (ws ">" ws)
-equiAlt       ::=  conjuncts +/ (ws "|" ws)
+alternatives  ::=  (conjuncts +/ (ws "|" ws)) +/ (ws ">" ws)
 
-conjuncts   ::=  sequence
-              |  sequence ^"&"  e*/ws   /ws
-              |  sequence ^"&~" e*/ws   /ws
+conjuncts     ::=  sequence
+                |  sequence ^"&"  e*/ws   /ws
+                |  sequence ^"&~" e*/ws   /ws
 
-sequence    ::= e*/ws
-                (ws "/" e)?
-                (ws "=>" ws (word|quoted))?              => "seq"
+ps          ::= e*/ws                              => "ps"
+              | (e+/ws ws)? "^" quoted (ws e+/ws)? => "ps2"
+psx         ::= ps
+              | ps wp ^"/" ws e
+sequence    ::= psx
+              | psx ^"=>" (word|quoted) /ws
 
 ec       ::= [~\-\]\\\~]
            | escaped
@@ -21,13 +25,12 @@ ec       ::= [~\-\]\\\~]
 range    ::= ec          => "range"
            | ec ^"-" ec
 
-e        ::= word                             => "nonTerminal"
-           |    [(][)]                        => "epsilon"
-           |    ^"{" alternatives "}"   /ws
-           |    ^"["  (range*) "]"
-           |    ^"[~" (range*) "]"
-           |    ^"^" quoted             /ws
-           |    ^"!" e                  /ws
+e        ::=  word                          => "nonTerminal"
+           |  quoted                        => "literal"
+           |    ^"()"
+           |    ^"{" sequence "}"       /ws
+           |    ^"["  range* "]"
+           |    ^"[~" range* "]"
 
            |  (e ws ^"**" > e ws ^"*")
            |  e ^"*/" e                 /ws
@@ -35,11 +38,8 @@ e        ::= word                             => "nonTerminal"
            |  e ^"+/" e                 /ws
            |  e ^"?"                    /ws
 
-           |  quoted                        => "literal"
-
-           |     "(" word ^")"          /ws
-           >    ^"(" alternatives ")"   /ws
-
+           |     "(" word         ^")"  /ws
+           >    ^"(" alternatives  ")"  /ws
 w       !::= " "
            | "//" ([~\n]*) "\n"
            | "\n"