X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=11cb9f8f17f8099f7529151a4fb7d4858d2c8404;hp=3a7d2f03dde1932f662d69c26e1a115a1404b5de;hb=f3b4ef0d81d572694905f4fe284cac6311a29ea4;hpb=1c86fe0488df6c123731f51d8636be37cff583ab

diff --git a/tests/meta.g b/tests/meta.g
index 3a7d2f0..11cb9f8 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,68 +1,74 @@
-s         ::=  ws grammar ws                  => "gram"
-ws       !::=  w**
-grammar   ::=  r +/ ws => "grammar"
-r         ::=  word  ^"::=" alternatives /ws
-            |  word ^"!::=" alternatives /ws
+// use 'a'-'z' or 'a-z' instead of [a-z]?
+// EOF token?
+// #include (with renaming?)
 
-alternatives  ::=  equiAlt   +/ (ws ">" ws)
-equiAlt       ::=  conjuncts +/ (ws "|" ws)          => "alternatives"
+s             =  ws! Grammar ws!
 
-sequence    ::= es
-              > es ws ^"/" e
-es          ::= e */ (w**)
+Grammar       =  Declaration +/ ws
 
-ss ::= es | es ^"/" e /ws
+Declaration   =  NonTerminal
+              |  ^"#import" ws! FileName //(ws! "as" ws! Prefix)?
 
-conjuncts   ::=  rewrite
-              |  rewrite ^"&"  e*/ws   /ws
-              |  rewrite ^"&~" e*/ws   /ws
+//Prefix        = ([a-zA-Z] ".")+ "*"
+FileName      = FileNameChar+ -> [\r\n ]
+FileNameChar  = Space:: "\\ "
+              | ~[\r\n ]
 
-rewrite  ::=  sequence                  /ws        => "rewrite"
-           |  sequence ^"=>" word       /ws
-           |  sequence ^"=>" quoted     /ws
-           |  sequence  "=>" "()"       /ws        => "wrap"
+NonTerminal   =  Word           "="     RHS /ws
+              |  Word  "*" ws! ^"=" ws! RHS
+              |  Word  "*/" Word ws! ^"=" ws! RHS
+       
+RHS           =  (Sequence +/ (ws! "|" ws!)) +/ (ws! ">" ws!)
 
-ec       ::= [~\-\]\\\~]
-           | escaped
+Elements      =  e*/ws
 
-range    ::= ec          => "range0"
-           | ec ^"-" ec  => "range1"
+PreSequence   =  Elements
+              |  (Quoted|Word)   ^"::" PreSequence /ws
+              >  PreSequence     ^"/"      e       /ws
+              |  PreSequence     ^"->"     e       /ws
 
-e        ::= word                             => "nonTerminalY"
-           |    [(][)] => "epsilon"
-           |    ^"{" alternatives "}"   /ws
-           |     "["  (range*) "]" => "range"
-           |     "[~" (range*) "]" => "rangex"
-           |  e ^"%%" e                 /ws
-           |  e ^"$$" e                 /ws
-           |  e ^"+/" e                 /ws
-           |  e ^"*/" e                 /ws
-           |  e ^"?"                    /ws
-           |  e ^"~/~"                  /ws
+Sequence      = psx:: PreSequence
+              |       Sequence ^"&"  Elements /ws
+              |       Sequence ^"&~" Elements /ws
 
-           |  e ^"-"  e                 /ws
+ec            = ~[\-\]\\]
+              | escaped
 
-           |    ^"!" e                  /ws
-           |     "^" quoted             /ws => "care"
-           |    ^"`" e                  /ws
-           |  e ^"#"                    /ws
-           |  quoted                        => "literal"
+Range         = ec
+              | ec ^"-" ec
 
-           |  (e ws ^"**" > e ws ^"*")
-           |  (e ws ^"++" > e ws ^"+")
+e             =                (Quoted|Word) ^":" e
+              >                NonTerminalReference
+              |                Literal
+              |                  ^"()"
+              |                  ^"{" PreSequence "}"    /ws
+              |                  ^"["  Range* "]"
+              |                e ^"++"                   /ws -> ~[/]
+              |                e ^"+"                    /ws -> ~[+]
+              |                e ^"++/" e                /ws        
+              |                e ^"+/"  e                /ws        
+              |                e ^"**"                   /ws -> ~[/]
+              |                e ^"*"                    /ws -> ~[*]
+              |                e ^"**/" e                /ws        
+              |                e ^"*/"  e                /ws        
+              |                     e ^"!"
+              |                e ^"?"                    /ws
+              |                  ^"^"   Quoted
+              >                  ^"(" RHS  ")"           /ws
+              |                  ^"~" e
 
-           |     "(" word ^")"          /ws
-           >    ^"(" alternatives ")"   /ws
-
-w       !::= " "
-           | "//" ([~\n]*) "\n"
-           | "\n"
-           | "\r"
-an       ::= [a-zA-Z0-9_]
-word     ::= an++                           => "sify"
-quoted   ::= "\"" (([~\"\\] | escaped)*) "\"" => "sify"
-escaped  ::= "\\n" => "\n"
-           | "\\r" => "\r"
-           | "\\" [~nr]
+NonTerminalReference = Word
+Literal              = Quoted
+Word                 = [a-zA-Z0-9_]++
+Quoted               = "\"" ((~[\"\\] | escaped)+) "\""
+                     | EmptyString
+                       EmptyString = "\"\""
 
+escaped    = "\n":: "\\n"
+           | "\r":: "\\r"
+           |        "\\" ~[nr]
 
+w             = " " | "\n" | "\r"
+ws            =  "()":: w**
+              |  "()":: w** "//" (~[\n])* "\n" ws
+wp            =  w++