X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Ftibdoc.g;h=51e66e1ca564613cb53aa6455c329c5994021691;hp=88ee6f8fd170e661f4f7adf723aa524ba7454e89;hb=439f7fedebf5fdf586c18e6c3ce0c50e703ec0ed;hpb=eec21f64634c3a76436a263254fc890b56b5b34d

diff --git a/tests/tibdoc.g b/tests/tibdoc.g
index 88ee6f8..51e66e1 100644
--- a/tests/tibdoc.g
+++ b/tests/tibdoc.g
@@ -56,48 +56,52 @@ nw         = ~[\r\n\ ]
 
 s                   = Doc
 
-Doc                 = head:{Header} body:Body  /ws
-Header              = "header" attrs:{ KeyVal */ ws }  /ws
-Body                = {Section}*/ws
-Section             = SectionHeader Paragraphs /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 alphanum++ !ws
+                    >      ws! alphanum++ ws!
 
 sp       = " "**
-blank    = !sp "\n" !sp "\n" !ws
+blank    = sp! "\n" sp! "\n" ws!
 
 KeyVal       = key:word "=" val:text /ws
 wp           = w++
 num          = [0-9]++
-Paragraphs   = "[]":: { Blockquote:: "\"\" "    text } Paragraphs
-             > "[]":: { HR::         "---" "-"*      } Paragraphs
-             > "[]":: { P::          text            } Paragraphs
-             > ()
 
-onums        = nums !(". "|") ")
+Paragraph   = Blockquote:: { "\"\" "    text }
+            > HR::         { "---" "-"*      }
+            > P::          { text            }
+
+onums        = nums (". "|") ")!
 any          = ~[]*
 
-uli          =  "* "         (!ws text &~ any !(oli|uli))
-oli          = !("# "|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
-             > "[]":: "\"" text "\""             Itemx
-             > "[]":: (Symbol:: sym++)           Itemx
-             > "[]":: { Block:: text }           Itemx
-
-blockquote   = Blockquote:: "\"\"" text "\"\""
-             | Blockquote:: "\"\"" block
+Item
+//*/ws
+     =
+// "[]":: blockquote                 ((ws! Item) | ())
+//             >
+ "[]":: { UL:: uli+/ws }           ((ws! Item) | ())
+             | "[]":: { OL:: oli+/ws }           ((ws! Item) | ())
+             > "[]":: pre                        ((ws! Item) | ())
+             > "[]":: link                       ((ws! Item) | ())
+             > "[]":: structured                 ((ws! Item) | ())
+             > "[]":: styled                     ((ws! Item) | ())
+             > "[]":: (Chars:: alphanum++)       ((ws! Item) | ())
+             > "[]":: "\"" text "\""             ((ws! Item) | ())
+             > "[]":: (Symbol:: sym++)           ((ws! Item) | ())
+             > "[]":: { Block:: text }           ((ws! Item) | ())
+
+
+//blockquote   = Blockquote:: "\"\"" (block | text "\"\"")
              
 pre          = Verbatim:: "[verbatim]" { ~[]+ } /ws   // FIXME doesn't work
 
@@ -116,9 +120,9 @@ styled       = Underline::     "__" text "__"
 block         = { text }
 
 link          = LinkText:: text:({ text })      "->" href:(url|email)
-              > LinkChars:: text:alphanum++  !ws "->" 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
@@ -157,7 +161,7 @@ part         = [a-zA-Z0-9\-]++
 // interesting use of boolean grammars
 //            &~ ([\-0-9] ~[]* | ~[]* [\-0-9])
 
-email        = Email:: user:username "@" host:host -> ~[.]
+email        = user:username "@" host:host -> ~[.]
 nums         = [0-9]++
 host         = IP::  nums "." nums "." nums "." nums
              | DNS:: domain