checkpoint

[sbp.git] / tests / meta.g

diff --git a/tests/meta.g b/tests/meta.g
index 3ee8fdf..a51109f 100644 (file)
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,12 +1,13 @@
+s             =  !ws Grammar !ws
+
+Grammar       =  NonTerminal +/ ws
+
+NonTerminal   =  Word "=" RHS /ws
 
 // use 'a'-'z' or 'a-z' instead of [a-z]?
 // EOF token?
 // #include (with renaming?)
 // ANTLR uses ! and ^ suffixes
-
-s             =  !ws (grammar::Grammar) !ws
-Grammar       =  NonTerminal +/ ws
-NonTerminal   =  Word ^"=" RHS /ws
         
 RHS           =  (Sequence +/ (!ws "|" !ws)) +/ (!ws ">" !ws)
 
@@ -24,14 +25,14 @@ 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
+              |                  ^"{" PreSequence "}"    /ws
               |                  ^"["  Range* "]"
               |                e ^"++"                   /ws -> ~[/]
               |                e ^"+"                    /ws -> ~[+]
@@ -47,8 +48,10 @@ e             =                (Quoted|Word) ^":" e
               |     "(" Word     ^")"                    /ws
               >                  ^"(" RHS  ")"           /ws
               |                  ^"~" e
-              >  "^^"::           "^"   e
+              >  "^^"::           "^" e
 
+NonTerminalReference = Word
+Literal = Quoted
 Word       = [a-zA-Z0-9_]++
 Quoted     = "\"" ((~[\"\\] | escaped)+) "\""
            | ""::   "\"\""
@@ -58,5 +61,5 @@ escaped    = "\n":: "\\n"
 
 w             = " " | "\n" | "\r"
 ws            =  "()":: w**
-              |  "()":: w** "//" ~[\n]* "\n" ws
+              |  "()":: w** "//" (~[\n])* "\n" ws
 wp            =  w++