X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=ed87f5c555bc4abb1198a6c8170d5c9cfa249195;hp=2f062c4fdf4e97403dff529be44ba41d7ed0f553;hb=0516ea34996c86664928ef948013b749876b87ec;hpb=a19f44a6cc6e3a2b0c2f3dadd7be2263d6ff0c3e

diff --git a/tests/meta.g b/tests/meta.g
index 2f062c4..ed87f5c 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,20 +1,27 @@
 s         ::=  ws grammar ws                  => "gram"
-ws       !::=  w**
+ws       !::=  w** | ws "//" ([~\n]*) "\n" ws
+wp       !::=  w++
 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
+conjuncts     ::=  sequence
+                |  sequence ^"&"  e*/ws   /ws
+                |  sequence ^"&~" e*/ws   /ws
+
+ps         ::= e*/ws                              => "ps"
+             | (e+/ws ws)? "^" quoted (ws e+/ws)? => "ps2"
+psy        ::= ps
+             | ps wp ^"/" ws e
+psx        ::= psy ^"?=>" e /ws
+             | psy ^"!=>" e /ws
+             > psy
+sequence   ::= quoted => "qprod"
+             > psx
+             | psx ^"=>" (word|quoted) /ws
 
 ec       ::= [~\-\]\\\~]
            | escaped
@@ -28,20 +35,16 @@ e        ::=  word                          => "nonTerminal"
            |    ^"{" sequence "}"       /ws
            |    ^"["  range* "]"
            |    ^"[~" range* "]"
-           |    ^"^" quoted             /ws
-//           |    ^"!" e                  /ws
 
-           |  (e ws ^"**" > e ws ^"*")
-           |  e ^"*/" e                 /ws
-           |  (e ws ^"++" > 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
 
            |     "(" word         ^")"  /ws
            >    ^"(" alternatives  ")"  /ws
-
 w       !::= " "
-           | "//" ([~\n]*) "\n"
            | "\n"
            | "\r"
 word     ::= [a-zA-Z0-9_]++