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

diff --git a/tests/meta.g b/tests/meta.g
index 2f062c4..292991c 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,16 +1,18 @@
 s         ::=  ws grammar ws                  => "gram"
-ws       !::=  w**
+ws      !::=  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
+conjuncts     ::=  sequence
+                |  sequence ^"&"  e*/ws   /ws
+                |  sequence ^"&~" e*/ws   /ws
 
-ps          ::= e*/ws => "ps"
+ps          ::= e*/ws                              => "ps"
+              | (e+/ws ws)? "^" quoted (ws e+/ws)? => "ps2"
 psx         ::= ps
               > ps ^"/" e /ws
 sequence    ::= psx
@@ -28,8 +30,6 @@ e        ::=  word                          => "nonTerminal"
            |    ^"{" sequence "}"       /ws
            |    ^"["  range* "]"
            |    ^"[~" range* "]"
-           |    ^"^" quoted             /ws
-//           |    ^"!" e                  /ws
 
            |  (e ws ^"**" > e ws ^"*")
            |  e ^"*/" e                 /ws
@@ -39,7 +39,6 @@ e        ::=  word                          => "nonTerminal"
 
            |     "(" word         ^")"  /ws
            >    ^"(" alternatives  ")"  /ws
-
 w       !::= " "
            | "//" ([~\n]*) "\n"
            | "\n"