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

furnace.chloe-tags: fix t:a, t:atom, t:form tags after recent Chloe change

db4
Slava Pestov 2010-08-22 21:55:34 -07:00
parent aaace74616
commit ad939e01f1
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
basis/furnace/chloe-tags/chloe-tags.factor
View File

@ -49,7 +49,7 @@ IN: furnace.chloe-tags
} cleave [ a-url ] [code] ; } cleave [ a-url ] [code] ;
CHLOE: atom CHLOE: atom
[ compile-children>string ] [ compile-a-url ] bi [ compile-children>xml-string ] [ compile-a-url ] bi
[ add-atom-feed ] [code] ; [ add-atom-feed ] [code] ;
CHLOE: write-atom drop [ write-atom-feeds ] [code] ; CHLOE: write-atom drop [ write-atom-feeds ] [code] ;
@ -73,7 +73,7 @@ CHLOE: write-atom drop [ write-atom-feeds ] [code] ;
CHLOE: a CHLOE: a
[ [
[ a-attrs ] [ a-attrs ]
[ compile-children>string ] bi [ compile-children>xml-string ] bi
[ <unescaped> [XML <a><-></a> XML] second swap >>attrs ] [ <unescaped> [XML <a><-></a> XML] second swap >>attrs ]
[xml-code] [xml-code]
] compile-with-scope ; ] compile-with-scope ;
@ -120,7 +120,7 @@ CHLOE: form
[ [
[ compile-form-attrs ] [ compile-form-attrs ]
[ hidden-fields ] [ hidden-fields ]
[ compile-children>string ] tri [ compile-children>xml-string ] tri
[ [
<unescaped> [XML <form><-><-></form> XML] second <unescaped> [XML <form><-><-></form> XML] second
swap >>attrs swap >>attrs

5
basis/html/templates/chloe/compiler/compiler.factor
View File

@ -133,9 +133,12 @@ ERROR: unknown-chloe-tag tag ;
: process-children ( tag quot -- ) : process-children ( tag quot -- )
[ [ compile-children ] compile-quot ] [ % ] bi* ; inline [ [ compile-children ] compile-quot ] [ % ] bi* ; inline
: compile-children>xml-string ( tag -- )
[ with-string-writer ] process-children ;
: compile-children>string ( tag -- ) : compile-children>string ( tag -- )
t string-context? [ t string-context? [
[ with-string-writer ] process-children compile-children>xml-string
] with-variable ; ] with-variable ;
: compile-with-scope ( quot -- ) : compile-with-scope ( quot -- )