projects
/
sbp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
checkpoint
[sbp.git]
/
tests
/
tibdoc.g
diff --git
a/tests/tibdoc.g
b/tests/tibdoc.g
index
218274b
..
4dc497f
100644
(file)
--- a/
tests/tibdoc.g
+++ b/
tests/tibdoc.g
@@
-59,7
+59,7
@@
s = Doc
Doc = head:{Header} body:Body /ws
Header = "header" attrs:{ KeyVal */ ws } /ws
Body = {Section}*/ws
Doc = head:{Header} body:Body /ws
Header = "header" attrs:{ KeyVal */ ws } /ws
Body = {Section}*/ws
-Section = SectionHeader Paragraphs /ws
+Section = SectionHeader Paragraph* /ws
SectionHeader = "==" SectionHeaderBody "=="
SectionHeaderBody = "=" SectionHeaderBody "="
> !ws alphanum++ !ws
SectionHeader = "==" SectionHeaderBody "=="
SectionHeaderBody = "=" SectionHeaderBody "="
> !ws alphanum++ !ws
@@
-70,10
+70,10
@@
blank = !sp "\n" !sp "\n" !ws
KeyVal = key:word "=" val:text /ws
wp = w++
num = [0-9]++
KeyVal = key:word "=" val:text /ws
wp = w++
num = [0-9]++
-Paragraphs = "[]":: { Blockquote:: "\"\" " text } Paragraphs
- > "[]":: { HR:: "---" "-"* } Paragraphs
- > "[]":: { P:: text } Paragraphs
- > ()
+
+Paragraph = Blockquote:: { "\"\" " text }
+ > HR:: { "---" "-"* }
+ > P:: { text }
onums = nums !(". "|") ")
any = ~[]*
onums = nums !(". "|") ")
any = ~[]*
@@
-84,21
+84,19
@@
oli = !("# "|onums) (!ws text &~ any !(oli|uli))
text = Item
Itemx = !ws Item
| ()
text = Item
Itemx = !ws Item
| ()
-Item = blockquote
+Item = "[]":: blockquote Itemx
> "[]":: { UL:: uli+/ws } Itemx
| "[]":: { OL:: oli+/ws } Itemx
> "[]":: pre Itemx
> "[]":: link Itemx
> "[]":: structured Itemx
> "[]":: styled 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
> "[]":: "\"" text "\"" Itemx
-// > "[]":: symbol Itemx
> "[]":: (Symbol:: sym++) 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
pre = Verbatim:: "[verbatim]" { ~[]+ } /ws // FIXME doesn't work
@@
-116,8
+114,8
@@
styled = Underline:: "__" text "__"
block = { 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?
> glyph
structured = command & "\\" !([a-zA-Z0-9]++) block?
> glyph
@@
-142,8
+140,15
@@
urlc = [a-zA-Z0-9;/?:&=$\-_.+@]
urlv = urlc | [%]
urlchar = urlc
| urlescape:: "%" [0-9] [0-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 +/ ".") -> ~"."
url_login = Login:: username:username password:(":" password) "@"
method = [+\-.a-z0-9]+
domain = (part +/ ".") -> ~"."
@@
-164,7
+169,7
@@
word = alphanum++
| quoted
quoted = "\"" ((~[\"\\] | escaped)+) "\""
| quoted
quoted = "\"" ((~[\"\\] | escaped)+) "\""
- | "":: "\"\""
+ | "\"\"":: "\"\""
escaped = lf:: "\\n"
| cr:: "\\r"
| "\\" ~[nr]
escaped = lf:: "\\n"
| cr:: "\\r"
| "\\" ~[nr]
@@
-173,7
+178,6
@@
escaped = lf:: "\\n"
// Chars ///////////////////////////////////////////////////////////////
alpha = [a-zA-Z]
// Chars ///////////////////////////////////////////////////////////////
alpha = [a-zA-Z]
-//num = [0-9]
alphanum = [a-zA-Z0-9]
sym = ~[a-zA-Z0-9\ \r\n=\">]
alphanum = [a-zA-Z0-9]
sym = ~[a-zA-Z0-9\ \r\n=\">]