// [c] ...
// FIXME: these have to go at the top so they have their dropAll bit set before PreSequence.build...
-ws = w**
-w = [\r\n\ ]
+w = " " | "\n" | "\r"
+ws = "()":: w**
+// | "()":: w** "#" (~[\n])* "\n" ws
nw = ~[\r\n\ ]
//////////////////////////////////////////////////////////////////////////////
s = Doc
-Doc = Doc:: head:{Header} body:Body /ws
-Header = Header:: "header" attrs:{ kv */ ws } /ws
-Body = sections:Section*/ws
-Section = { 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 text !ws
+ > ws! text ws!
sp = " "**
-blank = !sp "\n" !sp "\n" !ws
+blank = sp! "\n" sp! "\n" ws!
-kv = kv:: key:word "=" val:text /ws
+KeyVal = key:bareword "=" val:text /ws
wp = w++
num = [0-9]++
-Paragraph = blockquote:: { "\"\"" !ws text }
- > hr:: { "---" "-"* }
- > p:: { text }
-onums = nums !(". "|") ")
+Paragraph = { Blockquote:: "\"\" " text }
+ > HR:: { "---" "-"* }
+ > { OL:: (text &~ (text! ws! {oli}+)) ws! {oli}+ }
+ > P:: { text }
+
+onums = nums (". "|") ")!
any = ~[]*
-uli = li:: "* " (!ws text &~ any (oli|uli))
-oli = li:: ("# "|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
- > "[]":: { ul:: uli+/ws } Itemx
- | "[]":: { ol:: oli+/ws } Itemx
- > "[]":: pre Itemx
- > "[]":: link Itemx
- > "[]":: structured Itemx
- > "[]":: styled Itemx
- > "[]":: (Chars:: alphanum++) Itemx
- > "[]":: qtext Itemx
- > "[]":: symbol Itemx
- > "[]":: (Symbol:: sym++) Itemx
- > "[]":: Paragraph Itemx
-
-blockquote = blockquote:: "\"\"" text "\"\""
- | blockquote:: "\"\"" block
+
+Item*/ws =
+ blockquote
+// > ^"#" ws! { ~[]* }
+ > Verbatim
+ > InlineGrammar
+ > link
+ > structured
+ > styled
+ > (Chars:: alphanum++)
+ > Quotes:: "\"" text "\""
+ > (Symbol:: sym++)
+ > { Block:: text }
+
+word = Chars:: bareword
+
+blockquote = "adsfafewag"
+//blockquote = Blockquote:: "\"\"" (block | text "\"\"")
-qtext = quoted:: "\"" text "\""
-pre = verbatim:: "[verbatim]" { ~[]+ } /ws // FIXME doesn't work
-
-styled = underline:: "__" text "__"
- | footnote:: "((" text "))"
- | tt:: "[[" text "]]"
- | citation:: "[" word "]"
- | strikethrough:: "!!" text "!!"
- | superscript:: "^^" (word|block)
- | subscript:: ",," (word|block)
- | smallcap:: "\\sc" block
- | bold:: "++" text "++"
- | keyword:: "!" (word|block)
+Verbatim = "[verbatim]" ws! { (~[])++ }
+
+#import meta.g as meta
+InlineGrammar = "\grammar" ws! { meta.Grammar }
+
+styled = Underline:: "__" text "__"
+ | Footnote:: "((" text "))"
+ | TT:: "[[" text "]]"
+ | Citation:: "[" word "]"
+ | Strikethrough:: "!!" text "!!"
+ | Superscript:: "^^" (word|block)
+ | Subscript:: ",," (word|block)
+ | Smallcap:: "\\sc" block
+ | Bold:: "++" text "++"
+ | Keyword:: "!" (word|block)
| Italic:: "**" text "**"
block = { text }
-link = link:: text:({ text }) "->" href:(url|email)
- > link:: text:alphanum++ !ws "->" href:(url|email)
+link = text:({ text }|word) "->" ws! href:href
+href = url | email | {href}
-structured = command & "\\" [a-zA-Z0-9]++ block?
+structured = command & "\\" ([a-zA-Z0-9]++)! block?
> glyph
> email
> url
-glyph = euro:: "(e)" | "(r)" | "(c)" | "(tm)" | "--" | "..."
+glyph = euro:: "(e)"
+ | r:: "(r)"
+ | c:: "(c)"
+ | tm:: "(tm)"
+ | emdash:: "--"
+ | ellipses:: "..."
+ | cent:: "\\cent"
+
+command = "\\" [a-z]++
-command = today:: "\\today"
- | bre:: "\\br"
// URLs //////////////////////////////////////////////////////////////////////////////
// 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;/?:&=$\-_.+@]
urlv = urlc | [%]
urlchar = urlc
- | "%":: "%" [0-9] [0-9]
-url = "mailto" ":" email -> ~urlv
- > method:method "://" url_login? host:host port:(":" nums)? path:("/" urlpath)? -> ~urlv
-url_login = login:: username (":" password) "@"
+ | urlescape:: "%" [0-9] [0-9]
+url = Mailto:: "mailto" ":" email -> ~urlv
+ > URL::
+ method:method
+ "://"
+ login:url_login?
+ host:host
+ port:(":" nums)?
+ path:("/" urlpath)?
+ ref:("#" urlpath)?
+ -> ~(urlv|[\#])
+url_login = Login:: username:username password:(":" password) "@"
method = [+\-.a-z0-9]+
domain = (part +/ ".") -> ~"."
part = [a-zA-Z0-9\-]++
// Tokens ///////////////////////////////////////////////////////////////////
-word = alphanum++
+bareword = alphanum++
| quoted
quoted = "\"" ((~[\"\\] | escaped)+) "\""
- | "":: "\"\""
-escaped = "\n":: "\\n"
- | "\r":: "\\r"
+ | "\"\"":: "\"\""
+escaped = lf:: "\\n"
+ | cr:: "\\r"
| "\\" ~[nr]
// Chars ///////////////////////////////////////////////////////////////
alpha = [a-zA-Z]
-//num = [0-9]
alphanum = [a-zA-Z0-9]
sym = ~[a-zA-Z0-9\ \r\n=\">]
+//sym = [,()]
projects / sbp.git / blobdiff