checkpoint

[sbp.git] / tests / tibdoc.g

diff --git a/tests/tibdoc.g b/tests/tibdoc.g
index 1c02f11..f93c5dd 100644 (file)
--- a/tests/tibdoc.g
+++ b/tests/tibdoc.g
@@ -56,10 +56,10 @@ nw         = ~[\r\n\ ]
 
 s                   = Doc
 
-Doc                 = head:Header body:Body  /ws
-Header              = H:: { "header" { KeyVal */ ws } /ws }
-Body                = B:: {Section}*/ws
-Section             = SectionHeader Paragraph* /ws
+Doc                 = head:Header ws! body:Body
+Header              = { "header" { KeyVal */ ws } /ws }
+Body                = { Section } */ws
+Section             = SectionHeader ws! Paragraph*
 SectionHeader       = "==" SectionHeaderBody "=="
 SectionHeaderBody   =  "=" SectionHeaderBody "="
                     >      ws! alphanum++ ws!
@@ -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            }
 
@@ -82,22 +82,23 @@ uli          =  "* "         (ws! text &~ any (oli|uli)!)
 oli          = ("# "|onums)! (ws! text &~ any (oli|uli)!)
 
 text         = Item
-Itemx        = ws! Item
-             | ()
-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
 
+Item*/ws     =
+               blockquote
+             > { UL:: uli+/ws }           
+             | { OL:: oli+/ws }           
+             > pre                        
+             > link                       
+             > structured                 
+             > styled                     
+             > (Chars:: alphanum++)       
+             > "\"" text "\""             
+             > (Symbol:: sym++)           
+             > { Block:: text }           
+
+word = Chars:: bareword
+
+blockquote = "adsfafewag"
 //blockquote   = Blockquote:: "\"\"" (block | text "\"\"")
              
 pre          = Verbatim:: "[verbatim]" { ~[]+ } /ws   // FIXME doesn't work
@@ -135,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;/?:&=$\-_.+@]
@@ -167,7 +168,7 @@ host         = IP::  nums "." nums "." nums "." nums
 
 // Tokens ///////////////////////////////////////////////////////////////////
 
-word       = alphanum++
+bareword   = alphanum++
            | quoted
 
 quoted     = "\"" ((~[\"\\] | escaped)+) "\""
@@ -182,5 +183,6 @@ escaped    = lf:: "\\n"
 alpha      = [a-zA-Z]
 alphanum   = [a-zA-Z0-9]
 sym        = ~[a-zA-Z0-9\ \r\n=\">]
+//sym        = [,()]