XML fixes

diff --git a/extra/faq/faq.factor b/extra/faq/faq.factor
index f10e6481fa3b924c1c5d263dc791c14f075c43b1..1968a9e5f447095876e812fa6bce381742c5325c 100644 (file)
--- a/extra/faq/faq.factor
+++ b/extra/faq/faq.factor
@@ -8,7 +8,7 @@ IN: faq
 : find-after ( seq quot -- elem after )
     over >r find r> rot 1+ tail ; inline
 
-: tag-named? ( tag name -- ? )
+: tag-named*? ( tag name -- ? )
     assure-name swap tag-named? ;
 
 ! Questions
@@ -16,8 +16,8 @@ TUPLE: q/a question answer ;
 C: <q/a> q/a
 
 : li>q/a ( li -- q/a )
-    [ "br" tag-named? not ] subset
-    [ "strong" tag-named? ] find-after
+    [ "br" tag-named*? not ] subset
+    [ "strong" tag-named*? ] find-after
     >r tag-children r> <q/a> ;
 
 : q/a>li ( q/a -- li )

diff --git a/extra/xml/utilities/utilities.factor b/extra/xml/utilities/utilities.factor
index a86b1c92145a9ae7c1f262351f5e23d4752adbd6..fe64684f22c4eda09a789446d765261e251d132f 100644 (file)
--- a/extra/xml/utilities/utilities.factor
+++ b/extra/xml/utilities/utilities.factor
@@ -120,10 +120,10 @@ M: xml xml-inject >r delegate >r xml-inject ;
     dup tag? [ names-match? ] [ 2drop f ] if ;\r
 \r
 : tag-named* ( tag name/string -- matching-tag )\r
-    assure-name swap [ dupd tag-named? ] xml-find nip ;\r
+    assure-name [ swap tag-named? ] curry xml-find ;\r
 \r
 : tags-named* ( tag name/string -- tags-seq )\r
-    assure-name swap [ dupd tag-named? ] xml-subset nip ;\r
+    assure-name [ swap tag-named? ] curry xml-subset ;\r
 \r
 : tag-named ( tag name/string -- matching-tag )\r
     ! like get-name-tag but only looks at direct children,\r
@@ -144,7 +144,7 @@ M: xml xml-inject >r delegate >r xml-inject ;
     >r 1vector r> insert-children ;\r
 \r
 : tag-with-attr? ( elem attr-value attr-name -- ? )\r
-    rot dup tag? [ at = ] [ drop f ] if ;\r
+    rot dup tag? [ at = ] [ 3drop f ] if ;\r
 \r
 : tag-with-attr ( tag attr-value attr-name -- matching-tag )\r
     assure-name [ tag-with-attr? ] 2curry find nip ;\r
@@ -153,7 +153,7 @@ M: xml xml-inject >r delegate >r xml-inject ;
     assure-name [ tag-with-attr? ] 2curry subset ;\r
 \r
 : tag-with-attr* ( tag attr-value attr-name -- matching-tag )\r
-    assure-name [ tag-with-attr? ] 2curry xml-find nip ;\r
+    assure-name [ tag-with-attr? ] 2curry xml-find ;\r
 \r
 : tags-with-attr* ( tag attr-value attr-name -- tags-seq )\r
     assure-name [ tag-with-attr? ] 2curry xml-subset ;\r