got rid of caret ugliness in metagrammar

[sbp.git] / tests / meta.g

diff --git a/tests/meta.g b/tests/meta.g
index 93a9bb8..4f671c6 100644 (file)
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -10,7 +10,6 @@ Conjuncts   ::=  Sequence
 Elements    ::=  e*/ws
 
 ps          ::= Elements                           => "ps"
-              | (e+/ws !ws)? ^"^" Quoted (!ws e+/ws)?
 psy         ::= ps
               | ps !wp ^"/" !ws e
 psx         ::= psy                   => "psy"
@@ -42,6 +41,7 @@ e           ::=  word                          => "nonTerminal"
               |  e ^"*/"  e                /ws        
               |    ^"!"   e                /ws
               |  e ^"?"                    /ws
+              |   "^" Quoted               /ws => caret
 
               |     "(" word         ^")"  /ws
               >    ^"(" RHS  ")"           /ws