anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 05:25:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lyxfind: cleanup regex_replace() and back to a sane amount of logging during findadv operations.

Browse Source
This commit is contained in:
Tommaso Cucinotta 2017-04-17 00:41:29 +02:00
parent 6d05a96546
commit 4f75026176
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lyxfind.cpp
View File

@ -672,23 +672,13 @@ string escape_for_regex(string s, bool match_latex)
bool regex_replace(string const & s, string & t, string const & searchstr, bool regex_replace(string const & s, string & t, string const & searchstr,
string const & replacestr) string const & replacestr)
{ {
LYXERR(Debug::FIND, "regex_replace() - s='" << s
<< "', searchstr='" << searchstr
<< "', replacestr='" << replacestr);
#if LYX_USE_STD_REGEX
// this is the default anyway
lyx::regex e(searchstr, regex_constants::ECMAScript); lyx::regex e(searchstr, regex_constants::ECMAScript);
#else
// TBD: check
lyx::regex e(searchstr, regex_constants::ECMAScript);
#endif
ostringstream oss; ostringstream oss;
ostream_iterator<char, char> it(oss); ostream_iterator<char, char> it(oss);
lyx::regex_replace(it, s.begin(), s.end(), e, replacestr); lyx::regex_replace(it, s.begin(), s.end(), e, replacestr);
// tolerate t and s be references to the same variable // tolerate t and s be references to the same variable
bool rv = (s != oss.str()); bool rv = (s != oss.str());
t = oss.str(); t = oss.str();
LYXERR(Debug::FIND, "regex_replace() - t='" << t << "', rv=" << rv);
return rv; return rv;
} }