checkpoint

[sbp.git] / tests / meta.g

diff --git a/tests/meta.g b/tests/meta.g
index 845af52..a51109f 100644 (file)
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,13 +1,13 @@
+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?
 // #include (with renaming?)
 // ANTLR uses ! and ^ suffixes
-
-blah = "Grammar"
         
 RHS           =  (Sequence +/ (!ws "|" !ws)) +/ (!ws ">" !ws)
 
@@ -25,12 +25,12 @@ Sequence      = psx:: PreSequence
 ec            = ~[\-\]\\]
               | escaped
 
-Range         = range:: ec
-              |         ec ^"-" ec
+Range         = ec
+              | ec ^"-" ec
 
 e             =                (Quoted|Word) ^":" e
-              > nonTerminal::          Word
-              | literal::       Quoted
+              >                NonTerminalReference
+              |                Literal
               |                  ^"()"
               |                  ^"{" PreSequence "}"    /ws
               |                  ^"["  Range* "]"
@@ -50,6 +50,8 @@ e             =                (Quoted|Word) ^":" e
               |                  ^"~" e
               >  "^^"::           "^" e
 
+NonTerminalReference = Word
+Literal = Quoted
 Word       = [a-zA-Z0-9_]++
 Quoted     = "\"" ((~[\"\\] | escaped)+) "\""
            | ""::   "\"\""