s = Doc
-Doc = head:{Header} body:Body /ws
-Header = "header" attrs:{ KeyVal */ ws } /ws
-Body = {Section}*/ws
-Section = SectionHeader Paragraph* /ws
+Doc = head:Header body:Body /ws
+Header = H:: { "header" { KeyVal */ ws } /ws }
+Body = B:: {Section}*/ws
+Section = SectionHeader ws! (Paragraph Paragraph)
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++
> HR:: { "---" "-"* }
> P:: { text }
-onums = nums !(". "|") ")
+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
- | ()
-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
-
-blockquote = Blockquote:: "\"\"" (block | text "\"\"")
+
+Item*/ws =
+ blockquote
+ > { UL:: uli+/ws }
+ | { OL:: oli+/ws }
+ > pre
+ > link
+ > structured
+ > styled
+ > (Chars:: alphanum++)
+ > "\"" text "\""
+ > (Symbol:: sym++)
+// > { Block:: text }
+
+blockquote = "adsfafewag"
+//blockquote = Blockquote:: "\"\"" (block | text "\"\"")
pre = Verbatim:: "[verbatim]" { ~[]+ } /ws // FIXME doesn't work
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
// 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