X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=bfa176dcc39acadce562a1d2bc406f65f6150711;hp=4f671c616a677af46089371dd8e4cc39d8f19a92;hb=d75bb01616a13797efda13d752e46a7564e00f41;hpb=36c0a6a931c043959183226705e14a6a6b82c5d2

diff --git a/tests/meta.g b/tests/meta.g
index 4f671c6..bfa176d 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -9,15 +9,12 @@ Conjuncts   ::=  Sequence
               |  Sequence ^"&~" Elements  /ws
 Elements    ::=  e*/ws
 
-ps          ::= Elements                           => "ps"
-psy         ::= ps
-              | ps !wp ^"/" !ws e
-psx         ::= psy                   => "psy"
-              | psy ^"->" e /ws
+psy         ::= Elements => "ps"
+              | psy !wp ^"/"  !ws e
+              | psy     ^"->"     e /ws
 Sequence    ::= Quoted => "qprod"
-              > psx => "psx"
-              | psx  "=>" ^"[]"              /ws
-              | psx ^"=>" ("()"|word|Quoted) /ws
+              > psy => "psx"
+              | psy ^"=>" ("[]"|"()"|word|Quoted) /ws
 
 ec          ::= ~[\-\]\\]
               | escaped
@@ -41,7 +38,7 @@ e           ::=  word                          => "nonTerminal"
               |  e ^"*/"  e                /ws        
               |    ^"!"   e                /ws
               |  e ^"?"                    /ws
-              |   "^" Quoted               /ws => caret
+              |    ^"^" Quoted             /ws
 
               |     "(" word         ^")"  /ws
               >    ^"(" RHS  ")"           /ws