mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-23 05:25:26 +00:00
lyxfind: cleanup regex_replace() and back to a sane amount of logging during findadv operations.
This commit is contained in:
parent
6d05a96546
commit
4f75026176
@ -672,23 +672,13 @@ string escape_for_regex(string s, bool match_latex)
|
||||
bool regex_replace(string const & s, string & t, string const & searchstr,
|
||||
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);
|
||||
#else
|
||||
// TBD: check
|
||||
lyx::regex e(searchstr, regex_constants::ECMAScript);
|
||||
#endif
|
||||
ostringstream oss;
|
||||
ostream_iterator<char, char> it(oss);
|
||||
lyx::regex_replace(it, s.begin(), s.end(), e, replacestr);
|
||||
// tolerate t and s be references to the same variable
|
||||
bool rv = (s != oss.str());
|
||||
t = oss.str();
|
||||
LYXERR(Debug::FIND, "regex_replace() - t='" << t << "', rv=" << rv);
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user