X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=cc33104b4536e4385dc2f0cc984f988186b1c64e;hp=f9e0e67830ed7d37a41b24b27e42e8006c946a49;hb=475743c156fc5b02e79cd787b3176f5fa1877f83;hpb=93ea8e84f6eadb1b2549754bbb832c75e4730e86

diff --git a/tests/meta.g b/tests/meta.g
index f9e0e67..cc33104 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,54 +1,57 @@
-s         ::=  ws grammar ws                  => "gram"
-ws       !::=  w**
-grammar   ::=  r +/ ws                        => "grammar"
-r         ::=  word  ^"::=" alternatives /ws
-            |  word ^"!::=" alternatives /ws
-
-alternatives  ::=  (conjuncts +/ (ws "|" ws)) +/ (ws ">" ws)
-
-conjuncts   ::=  sequence
-              |  sequence ^"&"  e*/ws   /ws
-              |  sequence ^"&~" e*/ws   /ws
-
-ps          ::= e*/ws => "ps"
-psx         ::= ps
-              > ps ^"/" e /ws
-sequence    ::= psx
-              | psx ^"=>" (word|quoted) /ws
-
-ec       ::= [~\-\]\\\~]
-           | escaped
-
-range    ::= ec          => "range"
-           | ec ^"-" ec
-
-e        ::=  word                          => "nonTerminal"
-           |  quoted                        => "literal"
-           |    ^"()"
-           |    ^"{" sequence "}"       /ws
-           |    ^"["  (range*) "]"
-           |    ^"[~" (range*) "]"
-           |    ^"^" quoted             /ws
-           |    ^"!" e                  /ws
-
-           |  (e ws ^"**" > e ws ^"*")
-           |  e ^"*/" e                 /ws
-           |  (e ws ^"++" > e ws ^"+")
-           |  e ^"+/" e                 /ws
-           |  e ^"?"                    /ws
-
-           |     "(" word         ^")"  /ws
-           >    ^"(" alternatives  ")"  /ws
-
-w       !::= " "
-           | "//" ([~\n]*) "\n"
-           | "\n"
-           | "\r"
-word     ::= [a-zA-Z0-9_]++
-quoted   ::= "\"" (([~\"\\] | escaped)+) "\""
-           | "\"\"" => ""
-escaped  ::= "\\n" => "\n"
-           | "\\r" => "\r"
-           | "\\" [~nr]
-
-
+s             =  ws gram:Grammar ws
+Grammar       =  grammar:: NonTerminal +/ ws
+NonTerminal   =            word  !wp ^"=" !wp RHS
+        
+RHS           =  (Sequence +/ (!ws "|" !ws)) +/ (!ws ">" !ws)
+
+Elements      =  e*/ws
+
+PreSequence   = ps::  Elements
+              |       PreSequence !wp ^"/"  !ws e
+              |       PreSequence     ^"->"     e /ws
+              |       (Quoted|word)   ^"::" PreSequence /ws
+
+Sequence      = psx:: PreSequence
+              |       Sequence !ws ^"&"  !ws Elements
+              |       Sequence !ws ^"&~" !ws Elements
+
+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
+              |     "(" word     ^")"                    /ws
+              >                  ^"(" RHS  ")"           /ws
+              |                  ^"~" e
+              >  "^^"::           "^"   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++