From: Tommaso Cucinotta Date: Sun, 16 Apr 2017 22:41:29 +0000 (+0200) Subject: lyxfind: cleanup regex_replace() and back to a sane amount of logging during findadv... X-Git-Tag: 2.3.0alpha1~41 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=4f750261761906492e97155c47279c71bdbc0d62;p=features.git lyxfind: cleanup regex_replace() and back to a sane amount of logging during findadv operations. --- diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp index 0ffb5b203c..c743fb81a1 100644 --- a/src/lyxfind.cpp +++ b/src/lyxfind.cpp @@ -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 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; }