checkpoint

[sbp.git] / tests / tibdoc.g

diff --git a/tests/tibdoc.g b/tests/tibdoc.g
index ce60b70..2afac83 100644 (file)
--- a/tests/tibdoc.g
+++ b/tests/tibdoc.g
@@ -57,22 +57,22 @@ nw         = ~[\r\n\ ]
 s                   = Doc
 
 Doc                 = head:{Header} body:Body  /ws
 s                   = Doc
 
 Doc                 = head:{Header} body:Body  /ws

-Header              = "header" attrs:{ kv */ ws }  /ws
+Header              = "header" attrs:{ KeyVal */ ws }  /ws

 Body                = {Section}*/ws
 Section             = SectionHeader Paragraph* /ws
 SectionHeader       = "==" SectionHeaderBody "=="
 SectionHeaderBody   =  "=" SectionHeaderBody "="
 Body                = {Section}*/ws
 Section             = SectionHeader Paragraph* /ws
 SectionHeader       = "==" SectionHeaderBody "=="
 SectionHeaderBody   =  "=" SectionHeaderBody "="

-                    >      !ws (Chars:: text:alphanum++) !ws
+                    >      !ws alphanum++ !ws

 
 sp       = " "**
 blank    = !sp "\n" !sp "\n" !ws
 
 
 sp       = " "**
 blank    = !sp "\n" !sp "\n" !ws
 

-kv           = key:word "=" val:text /ws
+KeyVal       = key:word "=" val:text /ws

 wp           = w++
 num          = [0-9]++
 Paragraph    = Blockquote:: { "\"\" "    text }
              > HR::         { "---" "-"*      }
 wp           = w++
 num          = [0-9]++
 Paragraph    = Blockquote:: { "\"\" "    text }
              > HR::         { "---" "-"*      }

-             >              { P:: t:text }
+             > P::          { text }

 
 onums        = nums !(". "|") ")
 any          = ~[]*
 
 onums        = nums !(". "|") ")
 any          = ~[]*