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

html.parser: Strip trailing slashes / in html tags. Add unit test. Fixes #1233.

db4
Doug Coleman 2014-11-30 09:33:39 -06:00
parent d0357cc349
commit 6dac68d593
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
extra/html/parser/parser-tests.factor
View File

@ -96,3 +96,34 @@ V{
] [ ] [
"<!--comment-->" parse-html "<!--comment-->" parse-html
] unit-test ] unit-test
! Issue #1233, trailing / in tags
{
V{
T{ tag
{ name "img" }
{ attributes H{ { "src" "http://factorcode.org" } } }
}
}
}
[ "<img src=\"http://factorcode.org\">" parse-html ] unit-test
{
V{
T{ tag
{ name "img" }
{ attributes H{ { "src" "http://factorcode.org" } } }
}
}
}
[ "<img src=\"http://factorcode.org\"/>" parse-html ] unit-test
{
V{
T{ tag
{ name "img" }
{ attributes H{ { "src" "http://factorcode.org" } } }
}
}
}
[ "<img src=\"http://factorcode.org\"////////>" parse-html ] unit-test

6
extra/html/parser/parser.factor
View File

@ -75,8 +75,10 @@ SYMBOL: tagstack
[ advance advance read-comment ] [ read-dtd ] if ; [ advance advance read-comment ] [ read-dtd ] if ;
: read-tag ( sequence-parser -- string ) : read-tag ( sequence-parser -- string )
[ [ current "><" member? ] take-until ] [
[ dup current CHAR: < = [ advance ] unless drop ] bi ; [ current "><" member? ] take-until
[ CHAR: / = ] trim-tail
] [ dup current CHAR: < = [ advance ] unless drop ] bi ;
: read-until-< ( sequence-parser -- string ) : read-until-< ( sequence-parser -- string )
[ current CHAR: < = ] take-until ; [ current CHAR: < = ] take-until ;