X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=f06eb2f42010e4165a6b498eb7203b98d8645e84;hp=b7dc2b85ad9d1ca64f9c09fe1a7d9c59de0fabbb;hb=61a0c83fd40b98292b2dfe1eaba237eb804b2cb4;hpb=bbf7a47f19dc41e54799f2f1236ba2cd3042dcfe

diff --git a/tests/meta.g b/tests/meta.g
index b7dc2b8..f06eb2f 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -15,7 +15,7 @@ NonTerminal   = NonTerminal:: Word            ws  "=" ws RHS
               |               Word  "*"       ws ^"=" ws RHS
               |               Word  "*/" Word ws ^"=" ws RHS
        
-RHS::         = ("|":: Sequence +/ (ws "|" ws)) +/ (ws ">" ws)
+RHS::         = ("|":: Sequence +/ (ws "|" ws)) +/ (ws (">" -> ~">") ws)
 
 Elements::    = e*/ws
 
@@ -26,6 +26,7 @@ PreSequence   = Elements
 
 Sequence      = PreSequence
               | Sequence ^"&"  Elements /ws
+              | ^"~~"  Elements /ws
               | Sequence ^"&~" Elements /ws
 
 e             =                                   e ^"!"
@@ -49,9 +50,11 @@ e             =                                   e ^"!"
               |                  ^"..."
               |                   "(" Word  ^")"
               >                  ^"(" RHS  ")"           /ws
-              |                  ^"~" e
+              |                 "~":: ("~" -> ~"~")!  e
               |                  ^"\\{"
               |                  ^"\\}"
+              |                  ^">>"
+              |                  ^"<<"
 
 Word::        = [.a-zA-Z0-9_]++ &~ "."+
 Quoted::      = "\"" (~[\"\\] | escaped)+ "\""
@@ -59,8 +62,12 @@ Quoted::      = "\"" (~[\"\\] | escaped)+ "\""
 
 Range::       = ec
               | ec "-" ec
+              | "<<":: [<][<]
+              | ">>":: [>][>]
 
-ec            = ~[\-\]\\]
+ec            = ~[\-\]\\<>]
+              | [>] -> ~[>]
+              | [<] -> ~[<]
               | escaped
 escaped       = "\n"::  "\\n"
               | "\r"::  "\\r"