X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=b1552f1bdf129fe3a32e46e0c23d62ff3c189c86;hp=d05ee8fc273103d40587ce332c461f6dfa3cb102;hb=22a2ca7685dcf29e9ddcc6e26443ea0277385fca;hpb=12fcf9485f22d83519b89587f25e2497a0cbc616

diff --git a/tests/meta.g b/tests/meta.g
index d05ee8f..b1552f1 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,66 +1,67 @@
-s         ::=  ws grammar ws                  => "gram"
-ws       !::=  w**
-grammar   ::=  r +/ ws                        => "grammar"
-r         ::=  word  ^"::=" alternatives /ws
-            |  word ^"!::=" alternatives /ws
+s             = ws Grammar ws
 
-alternatives  ::=  equiAlt   +/ (ws ">" ws)
-equiAlt       ::=  conjuncts +/ (ws "|" ws)
+Grammar::     = Declaration +/ ws
 
-sequence    ::= es
-              > es ws ^"/" e
-es          ::= e */ (w**)
+Declaration   = NonTerminal
+              | ^"#import" FileName            /ws
+              | ^"#import" FileName "as" Word  /ws
 
-ss ::= es | es ^"/" e /ws
+FileName::    = (~[\r\n ] | escaped)+ -> [\r\n ]
 
-conjuncts   ::=  rewrite
-              |  rewrite ^"&"  e*/ws   /ws
-              |  rewrite ^"&~" e*/ws   /ws
+NonTerminal   = NonTerminal:: Word            ws  "=" ws RHS
+              | DropNT::      Word  "!"       ws  "=" ws RHS
+              | Colons::      Word  "::"      ws  "=" ws RHS
+              |               Word  "*"       ws ^"=" ws RHS
+              |               Word  "*/" Word ws ^"=" ws RHS
+       
+RHS::         = ("|":: Sequence +/ (ws "|" ws)) +/ (ws ">" ws)
 
-rewrite  ::=  sequence                  /ws        => "rewrite"
-           |  sequence ^"=>" word       /ws
-           |  sequence ^"=>" quoted     /ws
-           |  sequence  "=>" "()"       /ws        => "wrap"
+Elements::    = e*/ws
 
-ec       ::= [~\-\]\\\~]
-           | escaped
+PreSequence   = Elements
+              | (Quoted|Word)   ^"::" PreSequence /ws
+              > PreSequence     ^"/"      e       /ws
+              | PreSequence     ^"->"     e       /ws
 
-range    ::= ec          => "range"
-           | ec ^"-" ec
+Sequence      = PreSequence
+              | Sequence ^"&"  Elements /ws
+              | Sequence ^"&~" Elements /ws
 
-e        ::= word                             => "nonTerminal"
-           |    [(][)]                        => "epsilon"
-           |    ^"{" alternatives "}"   /ws
-           |    ^"["  (range*) "]"
-           |    ^"[~" (range*) "]"
-           |    ^"^" quoted             /ws
-           |  e ^"~/~"                  /ws
-           |    ^"!" e                  /ws
+e             =                                   e ^"!"
+              >                (Quoted|Word) ^":" e
+              >                NonTerminalReference:: Word
+              |                Literal:: Quoted
+              |                  ^"()"
+              |                  ^"{" PreSequence "}"    /ws
+              |                  ^"["  Range* "]"
+              |                e ^"++"                   /ws -> ~[/]
+              |                e ^"+"                    /ws -> ~[+]
+              |                e ^"++/" e                /ws        
+              |                e ^"+/"  e                /ws        
+              |                e ^"**"                   /ws -> ~[/]
+              |                e ^"*"                    /ws -> ~[*]
+              |                e ^"**/" e                /ws        
+              |                e ^"*/"  e                /ws        
+              |                e ^"?"                    /ws
+              |                  ^"^"   Quoted
+              |                   "(" Word  ^")"
+              >                  ^"(" RHS  ")"           /ws
+              |                  ^"~" e
+              |                  ^"\\{"
+              |                  ^"\\}"
 
-           |    ^"`" e                  /ws
-           |  e ^"#"                    /ws
+Word::        = [.a-zA-Z0-9_]++
+Quoted::      = "\"" (~[\"\\] | escaped)+ "\""
+              | "\"\""
 
-           |  (e ws ^"**" > e ws ^"*")
-           |  e ^"*/" e                 /ws
-           |  (e ws ^"++" > e ws ^"+")
-           |  e ^"+/" e                 /ws
-           |  e ^"?"                    /ws
+Range::       = ec
+              | ec "-" ec
 
-           |  quoted                        => "literal"
-
-           |     "(" word ^")"          /ws
-           >    ^"(" alternatives ")"   /ws
-
-w       !::= " "
-           | "//" ([~\n]*) "\n"
-           | "\n"
-           | "\r"
-an       ::= [a-zA-Z0-9_]
-word     ::= an++
-quoted   ::= "\"" (([~\"\\] | escaped)+) "\""
-           | "\"\"" => ""
-escaped  ::= "\\n" => "\n"
-           | "\\r" => "\r"
-           | "\\" [~nr]
+ec            = ~[\-\]\\]
+              | escaped
+escaped       = "\n"::  "\\n"
+              | "\r"::  "\\r"
+              |         "\\" ~[nr]
 
+ws!           = [ \r\n]** ("//" ~[\n]* "\n" ws)?