checkpoint

[sbp.git] / tests / meta.g

diff --git a/tests/meta.g b/tests/meta.g
index eba7a6d..cc33104 100644 (file)
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,20 +1,19 @@
-s             =  gram::    !ws Grammar ws
+s             =  ws gram:Grammar ws
 Grammar       =  grammar:: NonTerminal +/ ws
 NonTerminal   =            word  !wp ^"=" !wp RHS
         
-RHS           =  (Conjuncts +/ (!ws "|" !ws)) +/ (!ws ">" !ws)
+RHS           =  (Sequence +/ (!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
+              |       Sequence !ws ^"&"  !ws Elements
+              |       Sequence !ws ^"&~" !ws Elements
 
 ec            = ~[\-\]\\]
               | escaped
@@ -38,11 +37,11 @@ e             =                (Quoted|word) ^":" e
               |                e ^"*/"  e                /ws        
               |                  ^"!"   e                /ws
               |                e ^"?"                    /ws
-              |                  ^"^" Quoted             /ws
-
-              |                   "(" word         ^")"  /ws
+              |                  ^"^"   Quoted
+              |     "(" word     ^")"                    /ws
               >                  ^"(" RHS  ")"           /ws
               |                  ^"~" e
+              >  "^^"::           "^"   e
 
 word       = [a-zA-Z0-9_]++
 Quoted     = "\"" ((~[\"\\] | escaped)+) "\""
@@ -53,6 +52,6 @@ escaped    = "\n":: "\\n"
 
 
 w             = " " | "\n" | "\r"
-ws            =  w** => ()
-              |  w** "//" ~[\n]* "\n" ws => ()
+ws            =  "()":: w**
+              |  "()":: w** "//" ~[\n]* "\n" ws
 wp            =  w++