Changeset 1549

Timestamp:

05/24/10 04:26:55 (15 years ago)

Author:

rsinfu

Message:

Fixed bugzilla 3088: std.xml.check() fails on xml comments.

Fixed wrong array indexing; s[0..n] scraps entire input after "--"!
Test case by Andrew Talbot.

Files:

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

trunk/docsrc/changelog.dd

@@ -5 +5 @@
-
-$(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 3088): std.xml.check() fails on xml comments)
-    $(LI $(BUGZILLA 3200): std.xml doesn't follow spec for Tag.text)
-    $(LI $(BUGZILLA 3873): std.range.repeat should have popBack defined)
-    $(LI $(BUGZILLA 3880): std.regex functions with const/immutable Regex object)
-    $(LI $(BUGZILLA 4109): writeln doesn't work with empty static array)
-    $(LI $(BUGZILLA 4202): Changset 1517 doesn't compile)
-    $(LI $(BUGZILLA 4228): std.array.replace contains 2 bugs)
-    )
-)
-
-<div id=version>

trunk/phobos/std/xml.d

@@ -2147 +2147 @@
-        }
-    }
-
-    void checkComment(ref string s) // rule 15
-    {
-        mixin Check!("Comment");
-
-        try { checkLiteral("<!--",s); } catch(Err e) { fail(e); }
-        int n = s.indexOf("--");
-        if (n == -1) fail("unterminated comment");
-0..n
+n..$
-        try { checkLiteral("-->",s); } catch(Err e) { fail(e); }
-    }
-
-    void checkPI(ref string s) // rule 16
-    {
-        mixin Check!("PI");
-
-        try
-        {
-            checkLiteral("<?",s);
@@ -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"?>
+<set>
+    <one>A</one>
+    <!-- comment -->
+    <two>B</two>
+</set>
+EOS";
+    try
+    {
+        check(s);
+    }
+    catch (CheckException e)
+    {
+        assert(0, e.toString());
+    }
-}
-
-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);