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

diff --git a/tests/meta.g b/tests/meta.g
index 8c3a343..cc33104 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,54 +1,57 @@
-s         ::=  w* Grammar w*                  => "gram"
-Grammar   ::=  R+ => "grammar"
-R         ::=  word  ^"::=" Alternatives
-            |  word ^"!::=" Alternatives
-
-ec        ::=  [~\]\\\-\~] | escaped
-
-Alternatives  ::=  EquiAlt   +/ ">"
-EquiAlt       ::=  Conjuncts +/ "|"                 => "alternatives"
-
-Sequence    ::= E+
-Conjuncts   ::=  Rewrite
-              |  Rewrite ^"&"  Sequence
-              |  Rewrite ^"&~" Sequence
-
-Rewrite  ::=  Sequence                             => "rewrite"
-           |  Sequence ^"=>" word
-           |  Sequence ^"=>" quoted
-           |  Sequence  "=>" "()"                  => "wrap"
-
-range    ::= ec => "range0" | ec ^"-" ec      => "range0"
-E        ::= word                             => "nonTerminalY"
-           |    [(][)] => "epsilon"
-           |    ^"{" Alternatives "}"
-           |     "[" [\~]?  range* "]"        => "range"
-           |  E ^"*/" E
-           |  E ^"+/" E
-           |  E ^"?"
-           |  E ^"~/~"
-
-           |  E ^"-"  E
-
-           |    ^"!" E
-           |     "^" quoted => "care"
-           |    ^"`" E
-           |  E ^"#"
-           |  quoted                        => "literal"
-
-           |  (E ^"**" > E ^"*")
-           |  (E ^"++" > E ^"+")
-
-           |     "(" word ^")"
-           >    ^"(" Alternatives ")"
-
-w       !::= " "
-           | "//" [~\n]* "\n"
-           | "\n"
-           | "\r"
-an       ::= [a-zA-Z0-9_]
-word     ::= an++                           => "sify"
-quoted   ::= "\"" ([~\"\\] | escaped)* "\"" => "sify"
-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++