checkpoint

[sbp.git] / tests / meta.g

diff --git a/tests/meta.g b/tests/meta.g
index 571b26c..eb793c5 100644 (file)
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,4 +1,4 @@
-s             =  !ws Grammar !ws
+s             =  ws! Grammar ws!
 
 Grammar       =  NonTerminal +/ ws
 
@@ -9,7 +9,7 @@ NonTerminal   =  Word "=" RHS /ws
 // #include (with renaming?)
 // ANTLR uses ! and ^ suffixes
         
-RHS           =  (Sequence +/ (!ws "|" !ws)) +/ (!ws ">" !ws)
+RHS           =  (Sequence +/ (ws! "|" ws!)) +/ (ws! ">" ws!)
 
 Elements      =  e*/ws
 
@@ -42,9 +42,10 @@ e             =                (Quoted|Word) ^":" e
               |                e ^"*"                    /ws -> ~[*]
               |                e ^"**/" e                /ws        
               |                e ^"*/"  e                /ws        
-              |                  ^"!"   e                /ws
+              |                     e ^"!"
               |                e ^"?"                    /ws
               |                  ^"^"   Quoted
+              |                  Quoted ^"^"
               >                  ^"(" RHS  ")"           /ws
               |                  ^"~" e