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

html.entities: faster html-escape by going through string once.

db4
John Benediktsson 2015-09-29 12:15:00 -07:00
parent 887d988a70
commit 08051d9ba8
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extra/html/entities/entities-tests.factor
View File

@ -6,6 +6,8 @@ IN: html.entities
{ "<foo>" } [ "&lt;foo&gt;" html-unescape ] unit-test { "<foo>" } [ "&lt;foo&gt;" html-unescape ] unit-test
{ "This &that" } [ "This &amp;that" html-unescape ] unit-test { "This &that" } [ "This &amp;that" html-unescape ] unit-test
{ "This &that" } [ "This &ampthat" html-unescape ] unit-test { "This &that" } [ "This &ampthat" html-unescape ] unit-test
{ "a&b<c>d" } [ "a&amp;b&lt;c&gt;d" html-unescape ] unit-test
{ "&amp;" } [ "&" html-escape ] unit-test { "&amp;" } [ "&" html-escape ] unit-test
{ "&lt;foo&gt;" } [ "<foo>" html-escape ] unit-test { "&lt;foo&gt;" } [ "<foo>" html-escape ] unit-test
{ "a&amp;b&lt;c&gt;d" } [ "a&b<c>d" html-escape ] unit-test

35
extra/html/entities/entities.factor
View File

@ -1,20 +1,35 @@
! Copyright (C) 2014 John Benediktsson ! Copyright (C) 2014 John Benediktsson
! See http://factorcode.org/license.txt for BSD license ! See http://factorcode.org/license.txt for BSD license
USING: assocs combinators.short-circuit kernel locals make math USING: assocs combinators.short-circuit kernel literals locals
math.order math.parser math.ranges regexp sequences splitting make math math.order math.parser math.ranges regexp sequences
strings ; splitting strings ;
IN: html.entities IN: html.entities
<PRIVATE
CONSTANT: html-escapes {
{ CHAR: & "&amp;" }
{ CHAR: < "&lt;" }
{ CHAR: > "&gt;" }
{ CHAR: \" "&quot;" }
{ CHAR: ' "&#39;" }
}
: next-escape ( seq -- i elt )
[ html-escapes key? ] find ;
: escape, ( seq i elt -- seq' )
[ [ head-slice , ] [ 1 + tail-slice ] 2bi ]
[ html-escapes at , ] bi* ;
PRIVATE>
: html-escape ( str -- newstr ) : html-escape ( str -- newstr )
{ [
{ "&" "&amp;" } [ dup next-escape dup ] [ escape, ] while 2drop ,
{ "<" "&lt;" } ] { } make dup length 1 > [ concat ] [ first ] if ;
{ ">" "&gt;" }
{ "\"" "&quot;" }
{ "'" "&#39;" }
} [ replace ] assoc-each ;
<PRIVATE <PRIVATE