X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=eba7a6d82b25c908e9e50c0795bb2cd6e15ee24f;hp=dd222e0fb820f433120e48c0be39db3442a44528;hb=61446887e40e11e0a7374e591e6d6c25c922093f;hpb=532434438112deeb88906e2ef02110679e5081de

diff --git a/tests/meta.g b/tests/meta.g
index dd222e0..eba7a6d 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,6 +1,6 @@
-s             =  !ws Grammar ws              => "gram"
-Grammar       =  NonTerminal +/ ws           => "grammar"
-NonTerminal   =  word  !wp ^"=" !wp RHS
+s             =  gram::    !ws Grammar ws
+Grammar       =  grammar:: NonTerminal +/ ws
+NonTerminal   =            word  !wp ^"=" !wp RHS
         
 RHS           =  (Conjuncts +/ (!ws "|" !ws)) +/ (!ws ">" !ws)
 
@@ -9,48 +9,47 @@ Conjuncts     =  Sequence
               |  Sequence ^"&~" Elements  /ws
 Elements      =  e*/ws
 
-PreSequence   = Elements => "ps"
-              | PreSequence !wp ^"/"  !ws e
-              | PreSequence     ^"->"     e /ws
-              | (Quoted|word)   ^"::" PreSequence /ws
-              | PreSequence     ^"=>" ("[]"|"()"|word|Quoted) /ws
-Sequence      = PreSequence    => "psx"
+PreSequence   = ps::  Elements
+              |       PreSequence !wp ^"/"  !ws e
+              |       PreSequence     ^"->"     e /ws
+              |       (Quoted|word)   ^"::" PreSequence /ws
+              |       PreSequence     ^"=>" ("[]"|"()"|word|Quoted) /ws
+Sequence      = psx:: PreSequence
 
 ec            = ~[\-\]\\]
               | escaped
 
-Range         = ec          => "range"
-              | ec ^"-" ec
-
-e             =
-                (Quoted|word) ^":" e
-              >  word                          => "nonTerminal"
-              |  Quoted                        => "literal"
-              |    ^"()"
-              |    ^"{" 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
+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]
+           | ""::   "\"\""
+escaped    = "\n":: "\\n"
+           | "\r":: "\\r"
+           |        "\\" ~[nr]
 
 
 w             = " " | "\n" | "\r"