xml fixes

diff --git a/contrib/xml/test.factor b/contrib/xml/test.factor
index c9746e724cf1fdccac825f4b2f27beee9f3be049..597a14009cd9fc2608510ee2d76ff19de69e304a 100644 (file)
--- a/contrib/xml/test.factor
+++ b/contrib/xml/test.factor
@@ -15,3 +15,5 @@ SYMBOL: xml-file
     tag-props hash ] unit-test\r
 [ t ] [ xml-file get tag-children second contained-tag? ] unit-test\r
 [ t ] [ [ "<a></b>" string>xml ] catch xml-parse-error? ] unit-test\r
+[ "<?xml version=\"1.0\" encoding=\"iso-8859-1\" standalone=\"no\"?><a b=\"c\"/>" ]\r
+[ "<a b='c'/>" xml-reprint ] unit-test\r

diff --git a/contrib/xml/tokenizer.factor b/contrib/xml/tokenizer.factor
index 741081302f6abba4cccd1a3c567884c3c8c77d03..1573d264ad3d947b66291d4cf0a017f2be01b44f 100644 (file)
--- a/contrib/xml/tokenizer.factor
+++ b/contrib/xml/tokenizer.factor
@@ -175,7 +175,6 @@ TUPLE: entity name ;
 \r
 : name-start-char? ( ch -- ? )\r
     {\r
-        { CHAR: :    CHAR: :    }\r
         { CHAR: _    CHAR: _    }\r
         { CHAR: A    CHAR: Z    }\r
         { CHAR: a    CHAR: z    }\r

diff --git a/contrib/xml/writer.factor b/contrib/xml/writer.factor
index f83e85cca820368b9e856b600f77d8f706085314..c6f245e54a9c08ddedf4b13531befaafdcb5a527 100644 (file)
--- a/contrib/xml/writer.factor
+++ b/contrib/xml/writer.factor
@@ -6,7 +6,7 @@ USING: hashtables kernel math namespaces sequences strings generic ;
 GENERIC: (xml>string) ( object -- )\r
 \r
 : print-name ( name -- )\r
-    dup name-space [ % CHAR: : , ] when*\r
+    dup name-space dup "" = [ drop ] [ % CHAR: : , ] if\r
     name-tag % ;\r
 \r
 : print-props ( hash -- )\r