checkpoint

[sbp.git] / tests / meta.g

diff --git a/tests/meta.g b/tests/meta.g
index 571b26c..f2dfb17 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
 
@@ -7,16 +7,15 @@ NonTerminal   =  Word "=" RHS /ws
 // use 'a'-'z' or 'a-z' instead of [a-z]?
 // EOF token?
 // #include (with renaming?)
-// ANTLR uses ! and ^ suffixes
         
-RHS           =  (Sequence +/ (!ws "|" !ws)) +/ (!ws ">" !ws)
+RHS           =  (Sequence +/ (ws! "|" ws!)) +/ (ws! ">" ws!)
 
 Elements      =  e*/ws
 
 PreSequence   = ps::  Elements
-              |       (Quoted|Word)   ^"::" PreSequence /ws
-              >       PreSequence     ^"/"      e       /ws
-              |       PreSequence     ^"->"     e       /ws
+              |  (Quoted|Word)   ^"::" PreSequence /ws
+              >  PreSequence     ^"/"      e       /ws
+              |  PreSequence     ^"->"     e       /ws
 
 Sequence      = psx:: PreSequence
               |       Sequence ^"&"  Elements /ws
@@ -42,7 +41,7 @@ e             =                (Quoted|Word) ^":" e
               |                e ^"*"                    /ws -> ~[*]
               |                e ^"**/" e                /ws        
               |                e ^"*/"  e                /ws        
-              |                  ^"!"   e                /ws
+              |                     e ^"!"
               |                e ^"?"                    /ws
               |                  ^"^"   Quoted
               >                  ^"(" RHS  ")"           /ws