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

diff --git a/tests/tibdoc.g b/tests/tibdoc.g
index 56a84c6..1c02f11 100644
--- a/tests/tibdoc.g
+++ b/tests/tibdoc.g
@@ -56,48 +56,49 @@ nw         = ~[\r\n\ ]
 
 s                   = Doc
 
-Doc                 = head:{Header} body:Body  /ws
-Header              = "header" attrs:{ kv */ ws }  /ws
-Body                = Section*/ws
-Section             = { Section:: header:SectionHeader paragraphs: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 (Chars:: text:alphanum++) !ws
+                    >      ws! alphanum++ ws!
 
 sp       = " "**
-blank    = !sp "\n" !sp "\n" !ws
+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::         { "---" "-"*      }
-             >              { P:: t:text }
 
-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
+Item         =
+// "[]":: blockquote                 Itemx
+//             >
+ "[]":: { UL:: uli+/ws }           Itemx
              | "[]":: { OL:: oli+/ws }           Itemx
              > "[]":: pre                        Itemx
              > "[]":: link                       Itemx
              > "[]":: structured                 Itemx
              > "[]":: styled                     Itemx
-             > "[]":: (Chars:: text:alphanum++)  Itemx
+             > "[]":: (Chars:: alphanum++)       Itemx
              > "[]":: "\"" text "\""             Itemx
-//           > "[]":: symbol                     Itemx
              > "[]":: (Symbol:: sym++)           Itemx
-             > "[]":: Paragraph                  Itemx
+             > "[]":: { Block:: text }           Itemx
 
-blockquote   = Blockquote:: "\"\"" text "\"\""
-             | Blockquote:: "\"\"" block
+//blockquote   = Blockquote:: "\"\"" (block | text "\"\"")
              
 pre          = Verbatim:: "[verbatim]" { ~[]+ } /ws   // FIXME doesn't work
 
@@ -115,10 +116,10 @@ styled       = Underline::     "__" 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
@@ -141,8 +142,15 @@ urlc         = [a-zA-Z0-9;/?:&=$\-_.+@]
 urlv         = urlc | [%]
 urlchar      = urlc
              | urlescape:: "%" [0-9] [0-9]
-url          = "mailto" ":"   email -> ~urlv
-             > URL:: method:method "://" login:url_login? host:host port:(":" nums)? path:("/" urlpath)? -> ~urlv
+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 +/ ".") -> ~"."
@@ -150,7 +158,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
@@ -163,7 +171,7 @@ word       = alphanum++
            | quoted
 
 quoted     = "\"" ((~[\"\\] | escaped)+) "\""
-           | "":: "\"\""
+           | "\"\"":: "\"\""
 escaped    = lf:: "\\n"
            | cr:: "\\r"
            | "\\" ~[nr]
@@ -172,7 +180,6 @@ escaped    = lf:: "\\n"
 // Chars ///////////////////////////////////////////////////////////////
 
 alpha      = [a-zA-Z]
-//num        = [0-9]
 alphanum   = [a-zA-Z0-9]
 sym        = ~[a-zA-Z0-9\ \r\n=\">]