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

handle farkup tables better

db4
Doug Coleman 2008-05-25 23:11:35 -05:00
parent 91aa69dda6
commit 3d92c0e1bd
2 changed files with 12 additions and 10 deletions

12
extra/farkup/farkup-tests.factor
View File

@ -36,17 +36,17 @@ IN: farkup.tests
[ "<p>|a</p>" ]
[ "|a" convert-farkup ] unit-test
[ "<p>|a|</p>" ]
[ "<table><tr><td>a</td></tr></table>" ]
[ "|a|" convert-farkup ] unit-test
[ "<table><tr><td>a</td><td>b</td></tr></table>" ]
[ "a|b" convert-farkup ] unit-test
[ "|a|b|" convert-farkup ] unit-test
[ "<table><tr><td>a</td><td>b</td></tr></table>\n<table><tr><td>c</td><td>d</td></tr></table>" ]
[ "a|b\nc|d" convert-farkup ] unit-test
[ "<table><tr><td>a</td><td>b</td></tr><tr><td>c</td><td>d</td></tr></table>" ]
[ "|a|b|\n|c|d|" convert-farkup ] unit-test
[ "<table><tr><td>a</td><td>b</td></tr></table>\n<table><tr><td>c</td><td>d</td></tr></table>\n" ]
[ "a|b\nc|d\n" convert-farkup ] unit-test
[ "<table><tr><td>a</td><td>b</td></tr><tr><td>c</td><td>d</td></tr></table>" ]
[ "|a|b|\n|c|d|\n" convert-farkup ] unit-test
[ "<p><strong>foo</strong>\n</p><h1>aheading</h1>\n<p>adfasd</p>" ]
[ "*foo*\n=aheading=\nadfasd" convert-farkup ] unit-test

10
extra/farkup/farkup.factor
View File

@ -129,12 +129,14 @@ MEMO: table-column ( -- parser )
text [ "td" surround-with-foo ] action ;
MEMO: table-row ( -- parser )
[
table-column "|" token hide list-of-many ,
] seq* [ "tr" surround-with-foo ] action ;
"|" token hide
table-column "|" token hide list-of
"|" token hide nl hide optional 4seq
[ "tr" surround-with-foo ] action ;
MEMO: table ( -- parser )
table-row repeat1 [ "table" surround-with-foo ] action ;
table-row repeat1
[ "table" surround-with-foo ] action ;
MEMO: code ( -- parser )
[