Minor fixes for xml entities and interpolate

2009-01-26 21:39:08 -06:00 · 2009-01-26 21:39:08 -06:00 · 9efe8fa520
parent 73f30edb29
commit 9efe8fa520
2 changed files with 2 additions and 1 deletions
--- a/basis/xml/entities/entities.factor
+++ b/basis/xml/entities/entities.factor
@ -16,6 +16,7 @@ IN: xml.entities
        { CHAR: & "&amp;"  }
        { CHAR: ' "&apos;" }
        { CHAR: " "&quot;" }
+        { CHAR: < "&lt;"   }
    } ;

 : escape-string-by ( str table -- escaped )
--- a/basis/xml/interpolate/interpolate.factor
+++ b/basis/xml/interpolate/interpolate.factor
@ -90,7 +90,7 @@ MACRO: interpolate-chunk ( string -- chunk )

 : parse-def ( accum delimiter word -- accum )
    [
-        parse-multiline-string
+        parse-multiline-string but-last
        [ string>chunk extract-variables collect ] keep
        parsed
    ] dip parsed ;