anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 18:08:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

With the move from \regexp{...} to \regexp{...\endregexp{}}, now I'd need

Browse Source 
a special method to find \endregexp{}}, not merely the closing brace.
This is now obsolete, so ok to remove this dead code.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39780 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Tommaso Cucinotta 2011-09-27 23:09:31 +00:00
parent 715f005d6c
commit ab73c741c2
1 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/lyxfind.cpp
View File

@ -565,30 +565,6 @@ string apply_escapes(string s, Escapes const & escape_map)
return s; return s;
} }
#if 0
// This is not used any longer, but I do not know if we want to delete
// it, since it seems like maybe it might be needed again.
/** Return the position of the closing brace matching the open one at s[pos],
** or s.size() if not found.
**/
static size_t find_matching_brace(string const & s, size_t pos)
{
LASSERT(s[pos] == '{', /* */);
int open_braces = 1;
for (++pos; pos < s.size(); ++pos) {
if (s[pos] == '\\')
++pos;
else if (s[pos] == '{')
++open_braces;
else if (s[pos] == '}') {
--open_braces;
if (open_braces == 0)
return pos;
}
}
return s.size();
}
#endif
/// Within \regexp{} apply get_lyx_unescapes() only (i.e., preserve regexp semantics of the string), /// Within \regexp{} apply get_lyx_unescapes() only (i.e., preserve regexp semantics of the string),
/// while outside apply get_lyx_unescapes()+get_regexp_escapes(). /// while outside apply get_lyx_unescapes()+get_regexp_escapes().
@ -611,7 +587,8 @@ string escape_for_regex(string s, bool match_latex)
LYXERR(Debug::FIND, "new_pos: " << new_pos); LYXERR(Debug::FIND, "new_pos: " << new_pos);
if (new_pos == s.size()) if (new_pos == s.size())
break; break;
size_t end_pos = s.find("\\endregexp{}}", new_pos + 8); // find_matching_brace(s, new_pos + 7); // Might fail if \\endregexp{} is preceeded by unexpected stuff (weird escapes)
size_t end_pos = s.find("\\endregexp{}}", new_pos + 8);
LYXERR(Debug::FIND, "end_pos: " << end_pos); LYXERR(Debug::FIND, "end_pos: " << end_pos);
t = s.substr(new_pos + 8, end_pos - (new_pos + 8)); t = s.substr(new_pos + 8, end_pos - (new_pos + 8));
LYXERR(Debug::FIND, "t in regexp : " << t); LYXERR(Debug::FIND, "t in regexp : " << t);