mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix the issue of place find_str(#156)

Browse Source
This commit is contained in:
Jinhao
2016-10-03 05:11:00 +08:00
parent 830839ae27
commit d8ce7ea1ba
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
source/gui/place.cpp
View File

@@ -2727,17 +2727,26 @@ namespace nana
std::size_t find_idstr(const std::string& text, const char* idstr, std::size_t off = 0) std::size_t find_idstr(const std::string& text, const char* idstr, std::size_t off = 0)
{ {
const auto len = std::strlen(idstr); const auto len = std::strlen(idstr);
auto pos = text.find(idstr, off);
if (text.npos == pos)
return text.npos;
if (pos && is_idchar(text[pos - 1])) while (true)
return text.npos; {
auto pos = text.find(idstr, off);
if (text.npos == pos)
return text.npos;
if ((pos + len < text.length()) && is_idchar(text[pos + len])) if (pos && is_idchar(text[pos - 1]))
return text.npos; {
off = pos + 1;
continue;
}
return pos; if ((pos + len < text.length()) && is_idchar(text[pos + len]))
{
off = pos + 1;
continue;
}
return pos;
}
} }
void update_div(std::string& div, const char* field, const char* attr, bool insertion) void update_div(std::string& div, const char* field, const char* attr, bool insertion)