X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Ftibdoc.g;h=1ea798de924f49c5bfea84a3a0fe0f0a98f4acd0;hp=918e80cccf12995c8b0e60a55954253a6c0a2dd1;hb=242a8711e98cbd3ed6d05271bf910fde38e9be9a;hpb=7783442fcff4e640ecdcbdb6149463048d32f7a7

diff --git a/tests/tibdoc.g b/tests/tibdoc.g
index 918e80c..1ea798d 100644
--- a/tests/tibdoc.g
+++ b/tests/tibdoc.g
@@ -30,7 +30,7 @@
 // FIXME: these have to go at the top so they have their dropAll bit set before PreSequence.build...
 ws      !::= w**
 w       !::=  [\r\n\ ]
-nw       ::= [~\r\n\ ]
+nw       ::= ~[\r\n\ ]
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -55,7 +55,7 @@ Paragraph  ::= { "\"\"" ws text }        => "blockquote"
              > { text }                  => "p"
 
 text       ::= item */ ws
-pre        ::= "[verbatim]" { [~]+ } /ws => "verbatim"   // FIXME doesn't work
+pre        ::= "[verbatim]" { ~[]+ } /ws => "verbatim"   // FIXME doesn't work
 item       ::= pre
              > email
              > structured
@@ -100,7 +100,7 @@ port       ::= [0-9]+
 
 domain     ::= part +/ "."
 part       ::= [a-zA-Z0-9\-]++    // interesting use of boolean grammars
-//            &~ ([\-0-9] [~]* | [~]* [\-0-9])
+//            &~ ([\-0-9] ~[]* | ~[]* [\-0-9])
 
 email      ::= username "@" host      => email
 host       ::= [0-9]+ "." [0-9]+ "." [0-9]+ "." [0-9]+ => "ip"
@@ -113,11 +113,11 @@ host       ::= [0-9]+ "." [0-9]+ "." [0-9]+ "." [0-9]+ => "ip"
 word     ::= alphanum++
            | quoted
 
-quoted   ::= "\"" (([~\"\\] | escaped)+) "\""
+quoted   ::= "\"" ((~[\"\\] | escaped)+) "\""
            | "\"\"" => ""
 escaped  ::= "\\n" => "\n"
            | "\\r" => "\r"
-           | "\\" [~nr]
+           | "\\" ~[nr]
 
 
 // Chars ///////////////////////////////////////////////////////////////
@@ -125,6 +125,6 @@ escaped  ::= "\\n" => "\n"
 alpha    ::= [a-zA-Z]
 num      ::= [0-9]
 alphanum ::= [a-zA-Z0-9]
-sym      ::= [~a-zA-Z0-9\ \r\n]
+sym      ::= ~[a-zA-Z0-9\ \r\n]