anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 02:49:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FindAdv: Small refactoring

Browse Source
This commit is contained in:
Kornel Benko 2021-01-04 16:57:56 +01:00
parent e8099942c7
commit ac6b27040a
1 changed files with 48 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/lyxfind.cpp
View File

@ -3557,6 +3557,34 @@ static void displayMResult(MatchResult &mres, int increment)
#define displayMres(s,i) #define displayMres(s,i)
#endif #endif
static bool findAdvForwardInnermost(DocIterator & cur)
{
size_t d;
DocIterator old_cur(cur.buffer());
int forwardCount = 0;
do {
d = cur.depth();
old_cur = cur;
cur.forwardPos();
if (!cur) {
break;
}
if (cur.depth() > d) {
forwardCount++;
continue;
}
if (cur.depth() == d)
break;
} while(1);
cur = old_cur;
if (forwardCount > 0) {
LYXERR(Debug::FIND, "Forwarded " << forwardCount << " step(s) (searching for innermost match)");
return true;;
}
else
return false;
}
/** Finalize an advanced find operation, advancing the cursor to the innermost /** Finalize an advanced find operation, advancing the cursor to the innermost
** position that matches, plus computing the length of the matching text to ** position that matches, plus computing the length of the matching text to
** be selected ** be selected
@ -3565,34 +3593,30 @@ int findAdvFinalize(DocIterator & cur, MatchStringAdv const & match, int expecte
{ {
// Search the foremost position that matches (avoids find of entire math // Search the foremost position that matches (avoids find of entire math
// inset when match at start of it) // inset when match at start of it)
size_t d;
DocIterator old_cur(cur.buffer()); DocIterator old_cur(cur.buffer());
MatchResult mres; MatchResult mres;
do { int max_match;
LYXERR(Debug::FIND, "Forwarding one step (searching for innermost match)"); if (findAdvForwardInnermost(cur)) {
d = cur.depth();
old_cur = cur;
cur.forwardPos();
if (!cur)
break;
if (cur.depth() > d)
continue;
if (cur.depth() == d)
break;
mres = match(cur); mres = match(cur);
displayMres(mres, 1); displayMres(mres, 0);
if (expected_len > 0) { if (expected_len > 0) {
if (mres.match_len < expected_len) if (mres.match_len < expected_len)
break; return 0;
} }
else { else {
if (mres.match_len <= 0) if (mres.match_len <= 0)
break; return 0;
} }
} while (1); max_match = mres.match_len;
cur = old_cur; }
mres = match(cur); /* match valid only if not searching whole words */ else if (expected_len < 0) {
int max_match = mres.match_len; mres = match(cur); /* match valid only if not searching whole words */
displayMres(mres, 0);
max_match = mres.match_len;
}
else {
max_match = expected_len;
}
if (max_match <= 0) return 0; if (max_match <= 0) return 0;
LYXERR(Debug::FIND, "Ok"); LYXERR(Debug::FIND, "Ok");
@ -3627,7 +3651,10 @@ int findAdvFinalize(DocIterator & cur, MatchStringAdv const & match, int expecte
int maxl = cur.lastpos() - cur.pos(); int maxl = cur.lastpos() - cur.pos();
// Greedy behaviour while matching regexps // Greedy behaviour while matching regexps
while (maxl > minl) { while (maxl > minl) {
int actual_match = match(cur, len).match_len; MatchResult mres2;
mres2 = match(cur, len);
displayMres(mres2, len);
int actual_match = mres2.match_len;
if (actual_match >= max_match) { if (actual_match >= max_match) {
// actual_match > max_match _can_ happen, // actual_match > max_match _can_ happen,
// if the search area splits // if the search area splits
@ -3690,24 +3717,7 @@ int findForwardAdv(DocIterator & cur, MatchStringAdv const & match)
if (!cur) if (!cur)
return 0; return 0;
while (!theApp()->longOperationCancelled() && cur) { while (!theApp()->longOperationCancelled() && cur) {
{ (void) findAdvForwardInnermost(cur);
// forward to
size_t d;
DocIterator old_cur(cur.buffer());
do {
d = cur.depth();
old_cur = cur;
cur.forwardPos();
if (!cur)
break;
if (cur.depth() > d)
continue;
if (cur.depth() == d)
break;
} while (1);
cur = old_cur;
}
LYXERR(Debug::FIND, "findForwardAdv() cur: " << cur); LYXERR(Debug::FIND, "findForwardAdv() cur: " << cur);
MatchResult mres = match(cur, -1, false); MatchResult mres = match(cur, -1, false);
displayMres(mres,-1) displayMres(mres,-1)