X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Ftibdoc.g;h=f93c5ddd1b8ffd0fee7758ed54883039de3b3537;hp=f455d899dcd59f5d894b0c22939251cdc4c6581a;hb=c4b4207ce1be50359c6bd8abe1d657ff8ae8ad6e;hpb=a7ba8d8a5f0cb7fbb5bf67f1a95f1cad5226c507

diff --git a/tests/tibdoc.g b/tests/tibdoc.g
index f455d89..f93c5dd 100644
--- a/tests/tibdoc.g
+++ b/tests/tibdoc.g
@@ -56,9 +56,9 @@ nw         = ~[\r\n\ ]
 
 s                   = Doc
 
-Doc                 = head:Header body:Body  /ws
+Doc                 = head:Header ws! body:Body
 Header              = { "header" { KeyVal */ ws } /ws }
-Body                = {Section}*/ws
+Body                = { Section } */ws
 Section             = SectionHeader ws! Paragraph*
 SectionHeader       = "==" SectionHeaderBody "=="
 SectionHeaderBody   =  "=" SectionHeaderBody "="
@@ -67,11 +67,11 @@ SectionHeaderBody   =  "=" SectionHeaderBody "="
 sp       = " "**
 blank    = sp! "\n" sp! "\n" ws!
 
-KeyVal       = key:word "=" val:text /ws
+KeyVal       = key:bareword "=" val:text /ws
 wp           = w++
 num          = [0-9]++
 
-Paragraph   = Blockquote:: { "\"\" "    text }
+Paragraph   = { Blockquote:: "\"\" "    text }
             > HR::         { "---" "-"*      }
             > P::          { text            }
 
@@ -94,7 +94,9 @@ Item*/ws     =
              > (Chars:: alphanum++)       
              > "\"" text "\""             
              > (Symbol:: sym++)           
-//             > { Block:: text }           
+             > { Block:: text }           
+
+word = Chars:: bareword
 
 blockquote = "adsfafewag"
 //blockquote   = Blockquote:: "\"\"" (block | text "\"\"")
@@ -134,7 +136,7 @@ command      = Today::     "\\today"
 // subtypes of url (ftp, etc) as conjunctions, but the "master pattern"
 // only gets parsed once
 
-urlpath      = urlchar*
+urlpath      = urlchar* -> ~urlv           // this ~urlv should be handled by url! bug!
 username     = [a-zA-Z0-9;/?:&=$\-_.+]++
 password     = [a-zA-Z0-9;/?:&=$\-_.+]++
 urlc         = [a-zA-Z0-9;/?:&=$\-_.+@]
@@ -166,7 +168,7 @@ host         = IP::  nums "." nums "." nums "." nums
 
 // Tokens ///////////////////////////////////////////////////////////////////
 
-word       = alphanum++
+bareword   = alphanum++
            | quoted
 
 quoted     = "\"" ((~[\"\\] | escaped)+) "\""
@@ -181,5 +183,6 @@ escaped    = lf:: "\\n"
 alpha      = [a-zA-Z]
 alphanum   = [a-zA-Z0-9]
 sym        = ~[a-zA-Z0-9\ \r\n=\">]
+//sym        = [,()]