Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify code in wxRegExImpl::Replace()

Browse Source 
Check for WXREGEX_CONVERT_TO_MB once and define textstr variable
pointing to the string data instead of using it several times.

No real changes.
This commit is contained in:
Vadim Zeitlin
2021-07-15 22:37:42 +02:00
parent 10dce93921
commit 3a52523f96
1 changed files with 10 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/common/regex.cpp
View File

@@ -725,8 +725,9 @@ int wxRegExImpl::Replace(wxString *text,
const wxChar *textstr = text->c_str(); const wxChar *textstr = text->c_str();
size_t textlen = text->length(); size_t textlen = text->length();
#else #else
const wxScopedCharBuffer textstr = text->utf8_str(); const wxScopedCharBuffer textbuf = text->utf8_str();
size_t textlen = textstr.length(); const char* const textstr = textbuf.data();
size_t textlen = textbuf.length();
text->clear(); text->clear();
#endif #endif
@@ -757,14 +758,9 @@ int wxRegExImpl::Replace(wxString *text,
// note that "^" shouldn't match after the first call to Matches() so we // note that "^" shouldn't match after the first call to Matches() so we
// use wxRE_NOTBOL to prevent it from happening // use wxRE_NOTBOL to prevent it from happening
while ( (!maxMatches || countRepl < maxMatches) && while ( (!maxMatches || countRepl < maxMatches) &&
Matches( Matches(textstr + matchStart,
#ifndef WXREGEX_CONVERT_TO_MB countRepl ? wxRE_NOTBOL : 0,
textstr + matchStart, textlen - matchStart) )
#else
textstr.data() + matchStart,
#endif
countRepl ? wxRE_NOTBOL : 0,
textlen - matchStart) )
{ {
// the string possibly contains back references: we need to calculate // the string possibly contains back references: we need to calculate
// the replacement text anew after each match // the replacement text anew after each match
@@ -808,14 +804,8 @@ int wxRegExImpl::Replace(wxString *text,
} }
else else
{ {
textNew += wxString( textNew += wxString(textstr + matchStart + start,
#ifndef WXREGEX_CONVERT_TO_MB wxConvUTF8, len);
textstr
#else
textstr.data()
#endif
+ matchStart + start,
wxConvUTF8, len);
mayHaveBackrefs = true; mayHaveBackrefs = true;
} }
@@ -841,11 +831,7 @@ int wxRegExImpl::Replace(wxString *text,
if (result.capacity() < result.length() + start + textNew.length()) if (result.capacity() < result.length() + start + textNew.length())
result.reserve(2 * result.length()); result.reserve(2 * result.length());
#ifndef WXREGEX_CONVERT_TO_MB result.append(wxString(textstr + matchStart, wxConvUTF8, start));
result.append(*text, matchStart, start);
#else
result.append(wxString(textstr.data() + matchStart, wxConvUTF8, start));
#endif
matchStart += start; matchStart += start;
result.append(textNew); result.append(textNew);
@@ -854,11 +840,7 @@ int wxRegExImpl::Replace(wxString *text,
matchStart += len; matchStart += len;
} }
#ifndef WXREGEX_CONVERT_TO_MB result.append(wxString(textstr + matchStart, wxConvUTF8));
result.append(*text, matchStart, wxString::npos);
#else
result.append(wxString(textstr.data() + matchStart, wxConvUTF8));
#endif
*text = result; *text = result;
return countRepl; return countRepl;