X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Ftibdoc.g;h=1c02f111e14568f55fe8e8cdf31b48d64582a793;hp=7841855bf13bbbafab769f6ab9b70341fca04f1e;hb=df76fcb56242a90011500ab89092d2108350a8ab;hpb=45d799349e635f1a99e3974e4504a43d5a7aaf33

diff --git a/tests/tibdoc.g b/tests/tibdoc.g
index 7841855..1c02f11 100644
--- a/tests/tibdoc.g
+++ b/tests/tibdoc.g
@@ -56,78 +56,78 @@ nw         = ~[\r\n\ ]
 
 s                   = Doc
 
-Doc                 = Doc:: head:{Header} body:Body   /ws
-Header              = Header:: "header" attrs:{ kv */ ws }     /ws
-Body                = sections:Section*/ws
-Section             = { section:: SectionHeader Paragraph* /ws }
+Doc                 = head:Header body:Body  /ws
+Header              = H:: { "header" { KeyVal */ ws } /ws }
+Body                = B:: {Section}*/ws
+Section             = SectionHeader Paragraph* /ws
 SectionHeader       = "==" SectionHeaderBody "=="
 SectionHeaderBody   =  "=" SectionHeaderBody "="
-                    >      !ws text !ws
+                    >      ws! alphanum++ ws!
 
 sp       = " "**
-blank    = !sp "\n" !sp "\n" !ws
+blank    = sp! "\n" sp! "\n" ws!
 
-kv           = kv:: key:word "=" val:text /ws
+KeyVal       = key:word "=" val:text /ws
 wp           = w++
 num          = [0-9]++
-Paragraph    = blockquote:: { "\"\"" !ws  text }
-             > hr::         { "---" "-"*      }
-             > p::          { text }
 
-onums        = nums !(". "|") ")
+Paragraph   = Blockquote:: { "\"\" "    text }
+            > HR::         { "---" "-"*      }
+            > P::          { text            }
+
+onums        = nums (". "|") ")!
 any          = ~[]*
 
-uli          = li:: "* "         (!ws text &~ any (oli|uli))
-oli          = li:: ("# "|onums) (!ws text &~ any (oli|uli))
+uli          =  "* "         (ws! text &~ any (oli|uli)!)
+oli          = ("# "|onums)! (ws! text &~ any (oli|uli)!)
 
 text         = Item
-Itemx        = !ws Item
+Itemx        = ws! Item
              | ()
-Item         = blockquote
-             > "[]":: { ul:: uli+/ws }          Itemx
-             | "[]":: { ol:: oli+/ws }          Itemx
-             > "[]":: pre                       Itemx
-             > "[]":: link                      Itemx
-             > "[]":: structured                Itemx
-             > "[]":: styled                    Itemx
-             > "[]":: (Chars:: alphanum++)      Itemx
-             > "[]":: qtext                     Itemx
-             > "[]":: symbol                    Itemx
-             > "[]":: (Symbol:: sym++)          Itemx
-             > "[]":: Paragraph                 Itemx
-
-blockquote   = blockquote:: "\"\"" text "\"\""
-             | blockquote:: "\"\"" block
+Item         =
+// "[]":: blockquote                 Itemx
+//             >
+ "[]":: { UL:: uli+/ws }           Itemx
+             | "[]":: { OL:: oli+/ws }           Itemx
+             > "[]":: pre                        Itemx
+             > "[]":: link                       Itemx
+             > "[]":: structured                 Itemx
+             > "[]":: styled                     Itemx
+             > "[]":: (Chars:: alphanum++)       Itemx
+             > "[]":: "\"" text "\""             Itemx
+             > "[]":: (Symbol:: sym++)           Itemx
+             > "[]":: { Block:: text }           Itemx
+
+//blockquote   = Blockquote:: "\"\"" (block | text "\"\"")
              
-qtext        = quoted:: "\"" text "\""
-pre          = verbatim:: "[verbatim]" { ~[]+ } /ws   // FIXME doesn't work
-
-styled       = underline::     "__" text "__"      
-             | footnote::      "((" text "))"      
-             | tt::            "[[" text "]]"
-             | citation::       "[" word "]"
-             | strikethrough:: "!!" text "!!"      
-             | superscript::   "^^" (word|block)   
-             | subscript::     ",," (word|block)   
-             | smallcap::      "\\sc" block        
-             | bold::           "++" text "++"
-             | keyword::         "!" (word|block)    
+pre          = Verbatim:: "[verbatim]" { ~[]+ } /ws   // FIXME doesn't work
+
+styled       = Underline::     "__" text "__"      
+             | Footnote::      "((" text "))"      
+             | TT::            "[[" text "]]"
+             | Citation::       "[" word "]"
+             | Strikethrough:: "!!" text "!!"      
+             | Superscript::   "^^" (word|block)   
+             | Subscript::     ",," (word|block)   
+             | Smallcap::      "\\sc" block        
+             | Bold::           "++" text "++"
+             | Keyword::         "!" (word|block)    
              | Italic::         "**" text "**"
 
 block         = { text }
 
-link          = link:: text:({ text })     "->" href:(url|email)
-              > link:: text:alphanum++ !ws "->" href:(url|email)
+link          = LinkText:: text:({ text })      "->" href:(url|email)
+              > LinkChars:: text:alphanum++  ws! "->" href:(url|email)
 
-structured    = command & "\\" [a-zA-Z0-9]++ block?
+structured    = command & "\\" ([a-zA-Z0-9]++)! block?
               > glyph
               > email
               > url
 
-glyph        = euro:: "(e)" | "(r)" | "(c)" | "(tm)" | "--" | "..."
+glyph        = Euro:: "(e)" | "(r)" | "(c)" | "(tm)" | emdash:: "--" | "..."
 
-command      = today:: "\\today"
-             | bre::   "\\br"
+command      = Today::     "\\today"
+             | LineBreak:: "\\br"
 
 // URLs //////////////////////////////////////////////////////////////////////////////
 
@@ -141,10 +141,17 @@ password     = [a-zA-Z0-9;/?:&=$\-_.+]++
 urlc         = [a-zA-Z0-9;/?:&=$\-_.+@]
 urlv         = urlc | [%]
 urlchar      = urlc
-             | "%":: "%" [0-9] [0-9]
-url          = "mailto" ":"   email -> ~urlv
-             > method:method "://" url_login? host:host port:(":" nums)? path:("/" urlpath)? -> ~urlv
-url_login    = login:: username (":" password) "@"
+             | urlescape:: "%" [0-9] [0-9]
+url          = Mailto:: "mailto" ":"   email -> ~urlv
+             > URL::
+                  method:method 
+                  "://"
+                  login:url_login?
+                  host:host
+                  port:(":" nums)?
+                  path:("/" urlpath)?
+                     -> ~urlv
+url_login    = Login:: username:username password:(":" password) "@"
 method       = [+\-.a-z0-9]+
 domain       = (part +/ ".") -> ~"."
 part         = [a-zA-Z0-9\-]++
@@ -164,16 +171,15 @@ word       = alphanum++
            | quoted
 
 quoted     = "\"" ((~[\"\\] | escaped)+) "\""
-           | "":: "\"\""
-escaped    = "\n":: "\\n"
-           | "\r":: "\\r"
+           | "\"\"":: "\"\""
+escaped    = lf:: "\\n"
+           | cr:: "\\r"
            | "\\" ~[nr]
 
 
 // Chars ///////////////////////////////////////////////////////////////
 
 alpha      = [a-zA-Z]
-//num        = [0-9]
 alphanum   = [a-zA-Z0-9]
 sym        = ~[a-zA-Z0-9\ \r\n=\">]