checkpoint

[sbp.git] / tests / meta.g

diff --git a/tests/meta.g b/tests/meta.g
index cbfee2a..28e9c6e 100644 (file)
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,6 +1,8 @@
+s             =  !ws Grammar !ws
+
 Grammar       =  NonTerminal +/ ws
-s             =  !ws (grammar::Grammar) !ws
-NonTerminal   =  Word ^"=" RHS /ws
+
+NonTerminal   =  Word "=" RHS /ws
 
 // use 'a'-'z' or 'a-z' instead of [a-z]?
 // EOF token?
@@ -23,11 +25,13 @@ Sequence      = psx:: PreSequence
 ec            = ~[\-\]\\]
               | escaped
 
-Range         = range:: ec
-              |         ec ^"-" ec
+Range         = ec
+              | ec ^"-" ec
+
+NonTerminalReference = Word
 
 e             =                (Quoted|Word) ^":" e
-              > nonTerminal::          Word
+              >                NonTerminalReference
               | literal::       Quoted
               |                  ^"()"
               |                  ^"{" PreSequence "}"    /ws