X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=a540d78e7ab107f058b819b7c567c1a3eb379989;hp=55bc02af5668533b149de1ee805deae3a024a560;hb=b14c82d2c557d38194abc5b0ebbacc87e880b709;hpb=b194da7e8cc5bd13e03d59008c34deefc4e15764

diff --git a/tests/meta.g b/tests/meta.g
index 55bc02a..a540d78 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,59 +1,58 @@
-s         ::=  ws grammar ws                  => "gram"
-ws       !::=  w**
-grammar   ::=  r+/ws => "grammar"
-r         ::=  word  ^"::=" alternatives /ws
-            |  word ^"!::=" alternatives /ws
-
-ec        ::=  [~\]\\\-\~] | escaped
-
-alternatives  ::=  equiAlt   +/ (ws ">" ws)
-equiAlt       ::=  conjuncts +/ (ws "|" ws)          => "alternatives"
-
-sequence    ::= Es
-              > Es ^"/" e  /ws
-Es          ::= e+
-//es          ::= E+/ws
-
-conjuncts   ::=  rewrite
-              |  rewrite ^"&"  sequence   /ws
-              |  rewrite ^"&~" sequence   /ws
-
-rewrite  ::=  sequence                  /ws        => "rewrite"
-           |  sequence ^"=>" word       /ws
-           |  sequence ^"=>" quoted     /ws
-           |  sequence  "=>" "()"       /ws        => "wrap"
-
-range    ::= ec => "range0" | ec ^"-" ec      => "range0"
-e        ::= word                             => "nonTerminalY"
-           |    [(][)] => "epsilon"
-           |    ^"{" alternatives "}"   /ws
-           |     "[" [\~]?  range* "]"        => "range"
-           |  e ^"*/" e                 /ws
-           |  e ^"+/" e                 /ws
-           |  e ^"?"                    /ws
-           |  e ^"~/~"                  /ws
-
-           |  e ^"-"  e                 /ws
-
-           |    ^"!" e                  /ws
-           |     "^" quoted             /ws => "care"
-           |    ^"`" e                  /ws
-           |  e ^"#"                    /ws
-           |  quoted                        => "literal"
-
-           |  (e ws ^"**" > e ws ^"*")
-           |  (e ws ^"++" > e ws ^"+")
-
-           |     "(" 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]
+s             =  gram::    !ws Grammar ws
+Grammar       =  grammar:: NonTerminal +/ ws
+NonTerminal   =            word  !wp ^"=" !wp RHS
+        
+RHS           =  (Conjuncts +/ (!ws "|" !ws)) +/ (!ws ">" !ws)
+
+Conjuncts     =  Sequence
+              |  Sequence ^"&"  Elements  /ws
+              |  Sequence ^"&~" Elements  /ws
+Elements      =  e*/ws
+
+PreSequence   = ps::  Elements
+              |       PreSequence !wp ^"/"  !ws e
+              |       PreSequence     ^"->"     e /ws
+              |       (Quoted|word)   ^"::" PreSequence /ws
+              |       PreSequence     ^"=>" ("[]"|"()"|word|Quoted) /ws
+Sequence      = psx:: PreSequence
+
+ec            = ~[\-\]\\]
+              | escaped
+
+Range         = range:: ec
+              |         ec ^"-" ec
+
+e             =                (Quoted|word) ^":" e
+              > nonTerminal::          word
+              | literal::       Quoted
+              |                  ^"()"
+              |                  ^"{" Sequence "}"       /ws
+              |                  ^"["  Range* "]"
+              |                e ^"++"                   /ws -> ~[/]
+              |                e ^"+"                    /ws -> ~[+]
+              |                e ^"++/" e                /ws        
+              |                e ^"+/"  e                /ws        
+              |                e ^"**"                   /ws -> ~[/]
+              |                e ^"*"                    /ws -> ~[*]
+              |                e ^"**/" e                /ws        
+              |                e ^"*/"  e                /ws        
+              |                  ^"!"   e                /ws
+              |                e ^"?"                    /ws
+              |                  ^"^" Quoted             /ws
+
+              |                   "(" word         ^")"  /ws
+              >                  ^"(" RHS  ")"           /ws
+              |                  ^"~" e
+
+word       = [a-zA-Z0-9_]++
+Quoted     = "\"" ((~[\"\\] | escaped)+) "\""
+           | ""::   "\"\""
+escaped    = "\n":: "\\n"
+           | "\r":: "\\r"
+           |        "\\" ~[nr]
+
+
+w             = " " | "\n" | "\r"
+ws            =  "()":: w**
+              |  "()":: w** "//" ~[\n]* "\n" ws
+wp            =  w++