X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=cbfee2aaf3a8dacca295899ddcc610e41be7cc98;hp=d8353a6af910c65d699e57c8c7c9f76e3e30bbe7;hb=628b3a8eaafdbe8507e841076051bff42aadf5ee;hpb=f283ebfd51424e761bea2dd5b3042cf765ca9ee6

diff --git a/tests/meta.g b/tests/meta.g
index d8353a6..cbfee2a 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,12 +1,11 @@
+Grammar       =  NonTerminal +/ ws
+s             =  !ws (grammar::Grammar) !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)
 
@@ -27,12 +26,11 @@ ec            = ~[\-\]\\]
 Range         = range:: ec
               |         ec ^"-" ec
 
-e             =//                (Quoted|Word) ^":" e
-//              > 
-              nonTerminal::          Word
+e             =                (Quoted|Word) ^":" e
+              > nonTerminal::          Word
               | literal::       Quoted
               |                  ^"()"
-              |                  ^"{" PreSequence "}"       /ws
+              |                  ^"{" PreSequence "}"    /ws
               |                  ^"["  Range* "]"
               |                e ^"++"                   /ws -> ~[/]
               |                e ^"+"                    /ws -> ~[+]
@@ -48,7 +46,7 @@ e             =//                (Quoted|Word) ^":" e
               |     "(" Word     ^")"                    /ws
               >                  ^"(" RHS  ")"           /ws
               |                  ^"~" e
-              >  "^^"::           "^"   e
+              >  "^^"::           "^" e
 
 Word       = [a-zA-Z0-9_]++
 Quoted     = "\"" ((~[\"\\] | escaped)+) "\""
@@ -59,5 +57,5 @@ escaped    = "\n":: "\\n"
 
 w             = " " | "\n" | "\r"
 ws            =  "()":: w**
-              |  "()":: w** "//" ~[\n]* "\n" ws
+              |  "()":: w** "//" (~[\n])* "\n" ws
 wp            =  w++