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

XPath: Fixed substring (3) implementation, optimized substring-after and substring for constant strings

Browse Source 
git-svn-id: http://pugixml.googlecode.com/svn/trunk@699 99668b35-9821-0410-8761-19e4c4f06640
This commit is contained in:
arseny.kapoulkine 2010-08-29 15:53:05 +00:00
parent b81027b00d
commit 88b4fbcff7
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/pugixml.cpp
View File

@ -4851,6 +4851,11 @@ namespace
{ {
return !strequal(_buffer, o._buffer); return !strequal(_buffer, o._buffer);
} }
bool uses_heap() const
{
return _uses_heap;
}
}; };
xpath_string xpath_string_const(const char_t* str) xpath_string xpath_string_const(const char_t* str)
@ -7401,7 +7406,7 @@ namespace pugi
const char_t* pos = find_substring(s.c_str(), p.c_str()); const char_t* pos = find_substring(s.c_str(), p.c_str());
return pos ? xpath_string(pos + p.length()) : xpath_string(); return pos ? xpath_string(pos + p.length(), s.uses_heap()) : xpath_string();
} }
case ast_func_substring_2: case ast_func_substring_2:
@ -7414,7 +7419,7 @@ namespace pugi
size_t pos = first < 1 ? 1 : (size_t)first; size_t pos = first < 1 ? 1 : (size_t)first;
return xpath_string(s.c_str() + (pos - 1)); return xpath_string(s.c_str() + (pos - 1), s.uses_heap());
} }
case ast_func_substring_3: case ast_func_substring_3:
@ -7428,16 +7433,17 @@ namespace pugi
if (is_nan(first) || is_nan(last)) return xpath_string(); if (is_nan(first) || is_nan(last)) return xpath_string();
else if (first >= s_length + 1) return xpath_string(); else if (first >= s_length + 1) return xpath_string();
else if (first >= last) return xpath_string(); else if (first >= last) return xpath_string();
else if (last < 1) return xpath_string();
size_t pos = first < 1 ? 1 : (size_t)first; size_t pos = first < 1 ? 1 : (size_t)first;
size_t end = last >= s_length + 1 ? s_length + 1 : (size_t)last; size_t end = last >= s_length + 1 ? s_length + 1 : (size_t)last;
size_t size_requested = end - pos; assert(1 <= pos && pos <= end && end <= s_length + 1);
size_t size_to_end = s_length - pos + 1;
size_t size = size_requested < size_to_end ? size_requested : size_to_end; if (end == s_length + 1)
return xpath_string(s.c_str() + (pos - 1), s.uses_heap());
return xpath_string(s.c_str() + pos - 1, s.c_str() + pos - 1 + size); else
return xpath_string(s.c_str() + (pos - 1), s.c_str() + (end - 1));
} }
case ast_func_normalize_space_0: case ast_func_normalize_space_0: