X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Ftibdoc.g;h=99bab8349118b1c9a94d930b941e5f342a742cbe;hp=918e80cccf12995c8b0e60a55954253a6c0a2dd1;hb=f33c05adc5aa3dd324c5352cdbd6f4b55359acad;hpb=a172395c46dac0c9fe82b6aa236abcd4f422fc08

diff --git a/tests/tibdoc.g b/tests/tibdoc.g
index 918e80c..99bab83 100644
--- a/tests/tibdoc.g
+++ b/tests/tibdoc.g
@@ -1,3 +1,4 @@
+x::="x"
 // indentation styling...
 // literal blocks [[need to ignore bracing]] double-colon style?
 // definition -- by prior line indentation, like headings in the original structured text
@@ -30,11 +31,11 @@
 // 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\ ]
 
 //////////////////////////////////////////////////////////////////////////////
 
-s                 ::= {Doc} => top
+s                 ::= { Doc } => "top"
 
 Doc               ::= Header   Body                       /ws => doc
 Header            ::= "header" { kv */ ws }               /ws => header
@@ -46,22 +47,21 @@ SectionHeaderBody ::=  "=" SectionHeaderBody "="
 
 kv         ::= word "=" text /ws => kv1
 
-num !::= [0-9]++
 Paragraph  ::= { "\"\"" ws text }        => "blockquote"
              > { "*" " " ws text }       => "ul"
              > { "#" " " ws text }       => "ol"
-             > { num " " ws text }       => "ol"
+             > { num " " ws text => "ol" }
              > { "---" "-"* }            => "hr"
              > { 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
              > styled
              > "\"" text "\""    => quoted
-             > [a-zA-Z0-9]++
+             > alphanum++        => "stringify"
              > symbol
 
 symbol     ::= symbolx & sym++
@@ -88,8 +88,8 @@ glyph      ::= "(r)" | "(c)" | "(tm)"  // euro symbol?
 // only gets parsed once
 
 urlpath    ::= urlchar*
-username   ::= [a-zA-Z0-9;/?:&=$\-_.+]++
-password   ::= [a-zA-Z0-9;/?:&=$\-_.+]++
+username   ::= [a-zA-Z0-9;/?:&=$\-_.+]++ => "stringify"
+password   ::= [a-zA-Z0-9;/?:&=$\-_.+]++ => "stringify"
 urlchar    ::= [a-zA-Z0-9;/?:&=$\-_.+@]
              | "%" [0-9] [0-9]       => "%"
 url        ::= "mailto" ":"   email
@@ -99,32 +99,33 @@ method     ::= [+\-.a-z0-9]+
 port       ::= [0-9]+
 
 domain     ::= part +/ "."
-part       ::= [a-zA-Z0-9\-]++    // interesting use of boolean grammars
-//            &~ ([\-0-9] [~]* | [~]* [\-0-9])
+part       ::= [A-Za-z0-9\-]++ => "stringify"
+//            &~ ([\-0-9] ~[]* | ~[]* [\-0-9])
 
 email      ::= username "@" host      => email
-host       ::= [0-9]+ "." [0-9]+ "." [0-9]+ "." [0-9]+ => "ip"
-             | domain
+host       ::= domain
+             | [0-9]+ "." [0-9]+ "." [0-9]+ "." [0-9]+ => "ip"
 
 
 
 // Tokens ///////////////////////////////////////////////////////////////////
 
-word     ::= alphanum++
+word     ::= alphanum++ => "stringify"
            | quoted
 
-quoted   ::= "\"" (([~\"\\] | escaped)+) "\""
+quoted   ::= "\"" ((~[\"\\] | escaped)+) "\""
            | "\"\"" => ""
 escaped  ::= "\\n" => "\n"
            | "\\r" => "\r"
-           | "\\" [~nr]
+           | "\\" ~[nr]
 
 
 // Chars ///////////////////////////////////////////////////////////////
 
 alpha    ::= [a-zA-Z]
-num      ::= [0-9]
+num     !::= [0-9]++ => "stringify"
+//num      ::= [0-9]
 alphanum ::= [a-zA-Z0-9]
-sym      ::= [~a-zA-Z0-9\ \r\n]
+sym      ::= ~[a-zA-Z0-9\ \r\n]