External/pugixml
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

XPath: Fixed empty string literals, don't add empty nodes/attributes in node sets (i.e. for self axis)

Browse Source 
git-svn-id: http://pugixml.googlecode.com/svn/trunk@172 99668b35-9821-0410-8761-19e4c4f06640
This commit is contained in:
arseny.kapoulkine 2009-10-21 20:37:25 +00:00
parent aabb302d60
commit 27ec5a0b37
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pugixpath.cpp
View File

@ -820,6 +820,7 @@ namespace pugi
void contents_clear() void contents_clear()
{ {
if (m_cur_lexeme_contents) m_cur_lexeme_contents[0] = 0;
m_clc_size = 0; m_clc_size = 0;
} }
@ -1434,6 +1435,8 @@ namespace pugi
void step_push(xpath_node_set& ns, const xml_attribute& a, const xml_node& parent) void step_push(xpath_node_set& ns, const xml_attribute& a, const xml_node& parent)
{ {
if (!a) return;
// There are no attribute nodes corresponding to attributes that declare namespaces // There are no attribute nodes corresponding to attributes that declare namespaces
// That is, "xmlns:..." or "xmlns" // That is, "xmlns:..." or "xmlns"
if (!strncmp(a.name(), "xmlns", 5) && (a.name()[5] == 0 || a.name()[5] == ':')) return; if (!strncmp(a.name(), "xmlns", 5) && (a.name()[5] == 0 || a.name()[5] == ':')) return;
@ -1461,6 +1464,8 @@ namespace pugi
void step_push(xpath_node_set& ns, const xml_node& n) void step_push(xpath_node_set& ns, const xml_node& n)
{ {
if (!n) return;
switch (m_test) switch (m_test)
{ {
case nodetest_name: case nodetest_name: