factor: trim using lists

[factor.git] / basis / xml / elements / elements.factor

diff --git a/basis/xml/elements/elements.factor b/basis/xml/elements/elements.factor
index 25d66bd8cf4b6e483d4d1796b009f2e6aa0cfa99..042cde931e7926136c58bbfca63c56f629926b7e 100644 (file)
--- a/basis/xml/elements/elements.factor
+++ b/basis/xml/elements/elements.factor
@@ -1,10 +1,8 @@
 ! Copyright (C) 2005, 2009 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel namespaces xml.tokenize xml.state xml.name
-xml.data accessors arrays make xml.char-classes fry assocs sequences
-math xml.errors sets combinators io.encodings io.encodings.iana
-unicode.case xml.dtd strings xml.entities unicode.categories ;
-FROM: namespaces => set ;
+USING: arrays assocs combinators kernel make math namespaces
+sequences sets strings unicode xml.char-classes xml.data xml.dtd
+xml.errors xml.name xml.state xml.tokenize ;
 IN: xml.elements
 
 : take-interpolated ( quot -- interpolated )
@@ -19,7 +17,7 @@ IN: xml.elements
     [ quoteless-attr ] take-interpolated ;
 
 : start-tag ( -- name ? )
-    #! Outputs the name and whether this is a closing tag
+    ! Outputs the name and whether this is a closing tag
     get-char CHAR: / eq? dup [ next ] when
     parse-name swap ;
 
@@ -122,8 +120,8 @@ DEFER: make-tag ! Is this unavoidable?
 
 : take-internal-subset ( -- dtd )
     [
-        H{ } clone pe-table set
-        t in-dtd? set
+        H{ } clone pe-table namespaces:set
+        t in-dtd? namespaces:set
         dtd-loop
         pe-table get
     ] { } make swap extra-entities get swap <dtd> ;