Changeset 1544

Timestamp:

05/23/10 11:52:41 (15 years ago)

Author:

rsinfu

Message:

Fixed bugzilla 3200: std.xml doesn't follow spec for Tag.text.
Thanks to Rainer Schuetze for the patch!

Line 994: Here, we are decoding input, not encoding.
Line 1948: The text (pointed to by p) should be decoded.

In addition to the proposed patch, I explicitly specified DecodeMode?.LOOSE as done in other parts of this module. And I added Jesse Phillips' test case as a unittest.

Files:

• trunk/docsrc/changelog.dd (modified) (1 diff)
• trunk/phobos/std/xml.d (modified) (3 diffs)

trunk/docsrc/changelog.dd

@@ -4 +4 @@
-
-
-$(VERSION 047, May 9, 2010, =================================================,
-
-    $(WHATSNEW
-    $(LI std.functional: toDelegate now accepts callable(function pointers, delegates and objects implement opCall) )
-    $(LI std.traits: Added templates to get compile-time information about functions.)
-    $(LI std.typecons: Added tie and AutoImplement.)
-    )
-    $(BUGSFIXED
+    $(LI $(BUGZILLA 2835): std.socket.TcpSocket doesn't actually connect)
+    $(LI $(BUGZILLA 3200): std.xml doesn't follow spec for Tag.text)
-    $(LI $(BUGZILLA 3873): std.range.repeat should have popBack defined)
-    $(LI $(BUGZILLA 4202): Changset 1517 doesn't compile)
-    )
-)
-
-<div id=version>
-$(UL
-    $(NEW 047)
-    $(NEW 046)
-    $(NEW 045)

trunk/phobos/std/xml.d

@@ -984 +984 @@
-            if (optc(s,'/')) type = TagType.END;
-            name = munch(s,"^/>"~whitespace);
-            munch(s,whitespace);
-            while(s.length > 0 && s[0] != '>' && s[0] != '/')
-            {
-                string key = munch(s,"^="~whitespace);
-                munch(s,whitespace);
-                reqc(s,'=');
-                munch(s,whitespace);
-                reqc(s,'"');
-encode(munch(s,"^\"")
+decode(munch(s,"^\""), DecodeMode.LOOSE
-                reqc(s,'"');
-                munch(s,whitespace);
-                attr[key] = val;
-            }
-            if (optc(s,'/'))
-            {
-                if (type == TagType.END) throw new TagException("");
-                type = TagType.EMPTY;
-            }
-            reqc(s,'>');
@@ -1938 +1938 @@
-                    }
-                }
-                else if (tag_.isEnd)
-                {
-                    auto startTag = startTags[tag_.name];
-                    string text;
-
-                    immutable(char)* p = startTag.tagString.ptr
-                        + startTag.tagString.length;
-                    immutable(char)* q = tag_.tagString.ptr;
-p[0..(q-p)]
+decode(p[0..(q-p)], DecodeMode.LOOSE)
-
-                    auto element = new Element(startTag);
-                    if (text.length != 0) element ~= new Text(text);
-
-                    auto handler = tag_.name in onEndTag;
-                    if (handler !is null) (*handler)(element);
-                    else
-                    {
-                        handler = null in onEndTag;
-                        if (handler !is null) (*handler)(element);
@@ -2611 +2611 @@
-        ]");
-    assert(false);
-    }
-    catch(CheckException e)
-    {
-        int n = e.toString().indexOf("end tag name \"genres\" differs"
-            " from start tag name \"genre\"");
-        assert(n != -1);
-    }
-  }
+}
+
+unittest
+{
+    string s = q"EOS
+<?xml version="1.0" encoding="utf-8"?> <Tests>
+    <Test thing="What &amp; Up">What &amp; Up Second</Test>
+</Tests>
+EOS";
+    auto xml = new DocumentParser(s);
+
+    xml.onStartTag["Test"] = (ElementParser xml) {
+        assert(xml.tag.attr["thing"] == "What & Up");
+    };
+
+    xml.onEndTag["Test"] = (in Element e) {
+        assert(e.text == "What & Up Second");
+    };
+    xml.parse();
-}
-
-/** The base class for exceptions thrown by this module */
-class XMLException : Exception { this(string msg) { super(msg); } }
-
-// Other exceptions
-
-/// Thrown during Comment constructor
-class CommentException : XMLException
-{ private this(string msg) { super(msg); } }