Skip to content

fix a regression in std.xml (2.075a) #5489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dlang-bot merged 2 commits into from
Jun 15, 2017
Merged

fix a regression in std.xml (2.075a) #5489

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9713d71
Revert "Removed level of indirection from internal std.xml.ElementPar…
aG0aep6G Jun 15, 2017
c7b6b87
test against regression
aG0aep6G Jun 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 33 additions & 25 deletions std/xml.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ class Document : Element
this(xml.tag);
prolog = s[0 .. tagString.ptr - s.ptr];
parse(xml);
epilog = xml.s;
epilog = *xml.s;
}

/**
Expand Down Expand Up @@ -1721,12 +1721,20 @@ class DocumentParser : ElementParser
body
{
xmlText = xmlText_;
s = xmlText;
s = &xmlText;
super(); // Initialize everything
parse(); // Parse through the root tag (but not beyond)
}
}

@system unittest
{
auto doc = new Document("<root><child><grandchild/></child></root>");
assert(doc.elements.length == 1);
assert(doc.elements[0].tag.name == "child");
assert(doc.items == doc.elements);
}

/**
* Class for parsing an XML element.
*
Expand All @@ -1748,7 +1756,7 @@ class ElementParser
{
Tag tag_;
string elementStart;
string s;
string* s;

Handler commentHandler = null;
Handler cdataHandler = null;
Expand All @@ -1766,7 +1774,7 @@ class ElementParser
}

// Private constructor for empty tags
this(Tag tag, string t) @safe @nogc pure nothrow
this(Tag tag, string* t) @safe @nogc pure nothrow
{
s = t;
this();
Expand Down Expand Up @@ -1849,7 +1857,7 @@ class ElementParser

protected this() @safe @nogc pure nothrow
{
elementStart = s;
elementStart = *s;
}

/**
Expand Down Expand Up @@ -2005,37 +2013,37 @@ class ElementParser

while (s.length != 0)
{
if (startsWith(s,"<!--"))
if (startsWith(*s,"<!--"))
{
chop(s,4);
t = chop(s,indexOf(s,"-->"));
chop(*s,4);
t = chop(*s,indexOf(*s,"-->"));
if (commentHandler.funcptr !is null) commentHandler(t);
chop(s,3);
chop(*s,3);
}
else if (startsWith(s,"<![CDATA["))
else if (startsWith(*s,"<![CDATA["))
{
chop(s,9);
t = chop(s,indexOf(s,"]]>"));
chop(*s,9);
t = chop(*s,indexOf(*s,"]]>"));
if (cdataHandler.funcptr !is null) cdataHandler(t);
chop(s,3);
chop(*s,3);
}
else if (startsWith(s,"<!"))
else if (startsWith(*s,"<!"))
{
chop(s,2);
t = chop(s,indexOf(s,">"));
chop(*s,2);
t = chop(*s,indexOf(*s,">"));
if (xiHandler.funcptr !is null) xiHandler(t);
chop(s,1);
chop(*s,1);
}
else if (startsWith(s,"<?"))
else if (startsWith(*s,"<?"))
{
chop(s,2);
t = chop(s,indexOf(s,"?>"));
chop(*s,2);
t = chop(*s,indexOf(*s,"?>"));
if (piHandler.funcptr !is null) piHandler(t);
chop(s,2);
chop(*s,2);
}
else if (startsWith(s,"<"))
else if (startsWith(*s,"<"))
{
tag_ = new Tag(s,true);
tag_ = new Tag(*s,true);
if (root is null)
return; // Return to constructor of derived class

Expand Down Expand Up @@ -2091,7 +2099,7 @@ class ElementParser

// Handle the pretend start tag
string s2;
auto parser = new ElementParser(startTag,s2);
auto parser = new ElementParser(startTag,&s2);
auto handler1 = startTag.name in onStartTag;
if (handler1 !is null) (*handler1)(parser);
else
Expand All @@ -2113,7 +2121,7 @@ class ElementParser
}
else
{
t = chop(s,indexOf(s,"<"));
t = chop(*s,indexOf(*s,"<"));
if (rawTextHandler.funcptr !is null)
rawTextHandler(t);
else if (textHandler.funcptr !is null)
Expand Down