steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix [[link]]-foo --- should not create a list

db4
Doug Coleman 2008-09-24 19:26:37 -05:00
parent 7e5af60cbc
commit 72685aa77e
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
basis/farkup/farkup-tests.factor
View File

@ -139,5 +139,5 @@ link-no-follow? off
[ "<p>before:\n<pre><span class='OPERATOR'>{</span> <span class='DIGIT'>1</span> <span class='DIGIT'>2</span> <span class='DIGIT'>3</span> <span class='OPERATOR'>}</span> <span class='DIGIT'>1</span> tail\n</pre></p>" ] [ "<p>before:\n<pre><span class='OPERATOR'>{</span> <span class='DIGIT'>1</span> <span class='DIGIT'>2</span> <span class='DIGIT'>3</span> <span class='OPERATOR'>}</span> <span class='DIGIT'>1</span> tail\n</pre></p>" ]
[ "before:\n[factor{{ 1 2 3 } 1 tail}]" convert-farkup ] unit-test [ "before:\n[factor{{ 1 2 3 } 1 tail}]" convert-farkup ] unit-test
[ "<a href='Factor'>Factor</a>-rific!" ] [ "<p><a href='Factor'>Factor</a>-rific!</p>" ]
[ "[[Factor]]-rific" convert-farkup ] unit-test [ "[[Factor]]-rific!" convert-farkup ] unit-test

4
basis/farkup/farkup.factor
View File

@ -38,8 +38,6 @@ TUPLE: line ;
EBNF: parse-farkup EBNF: parse-farkup
nl = ("\r\n" | "\r" | "\n") => [[ drop "\n" ]] nl = ("\r\n" | "\r" | "\n") => [[ drop "\n" ]]
2nl = nl nl
heading1 = "=" (!("=" | nl).)+ "=" heading1 = "=" (!("=" | nl).)+ "="
=> [[ second >string heading1 boa ]] => [[ second >string heading1 boa ]]
@ -109,7 +107,7 @@ table = ((table-row nl => [[ first ]] )+ table-row? | table-row)
text = (!(nl | code | heading | inline-delimiter | table ).)+ text = (!(nl | code | heading | inline-delimiter | table ).)+
=> [[ >string ]] => [[ >string ]]
paragraph-item = (table | list | code | text | inline-tag | inline-delimiter)+ paragraph-item = (table | nl list | code | text | inline-tag | inline-delimiter)+
paragraph = ((paragraph-item nl => [[ first ]])+ nl+ => [[ first ]] paragraph = ((paragraph-item nl => [[ first ]])+ nl+ => [[ first ]]
| (paragraph-item nl)+ paragraph-item? | (paragraph-item nl)+ paragraph-item?
| paragraph-item) | paragraph-item)