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

XPath: Minor string operation refactoring

Browse Source 
Extract end of string to rend and add comments to translate_table.
This commit is contained in:
Arseny Kapoulkine 2014-11-19 22:44:08 -08:00
parent 6d048deba8
commit b8437664a9
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/pugixml.cpp
View File

@ -7435,6 +7435,7 @@ PUGI__NS_BEGIN
if (fc >= 128 || tc >= 128) if (fc >= 128 || tc >= 128)
return 0; return 0;
// code=128 means "skip character"
if (!table[fc]) if (!table[fc])
table[fc] = static_cast<unsigned char>(tc ? tc : 128); table[fc] = static_cast<unsigned char>(tc ? tc : 128);
@ -7469,6 +7470,8 @@ PUGI__NS_BEGIN
{ {
unsigned char code = table[index]; unsigned char code = table[index];
// code=128 means "skip character" (table size is 128 so 128 can be a special value)
// this code skips these characters without extra branches
*write = static_cast<char_t>(code); *write = static_cast<char_t>(code);
write += 1 - (code >> 7); write += 1 - (code >> 7);
} }
@ -9525,9 +9528,10 @@ PUGI__NS_BEGIN
const char_t* pos = find_substring(s.c_str(), p.c_str()); const char_t* pos = find_substring(s.c_str(), p.c_str());
if (!pos) return xpath_string(); if (!pos) return xpath_string();
const char_t* result = pos + p.length(); const char_t* rbegin = pos + p.length();
const char_t* rend = s.c_str() + s.length();
return s.uses_heap() ? xpath_string::from_heap(result, s.c_str() + s.length(), stack.result) : xpath_string::from_const(result); return s.uses_heap() ? xpath_string::from_heap(rbegin, rend, stack.result) : xpath_string::from_const(rbegin);
} }
case ast_func_substring_2: case ast_func_substring_2:
@ -9548,8 +9552,9 @@ PUGI__NS_BEGIN
assert(1 <= pos && pos <= s_length + 1); assert(1 <= pos && pos <= s_length + 1);
const char_t* rbegin = s.c_str() + (pos - 1); const char_t* rbegin = s.c_str() + (pos - 1);
const char_t* rend = s.c_str() + s.length();
return s.uses_heap() ? xpath_string::from_heap(rbegin, s.c_str() + s.length(), stack.result) : xpath_string::from_const(rbegin); return s.uses_heap() ? xpath_string::from_heap(rbegin, rend, stack.result) : xpath_string::from_const(rbegin);
} }
case ast_func_substring_3: case ast_func_substring_3: