From fdcf8ba0bdf0de50fdcac58b14c184b15723280a Mon Sep 17 00:00:00 2001 From: nyamatongwe Date: Sun, 15 Sep 2002 01:17:38 +0000 Subject: Made backwards regex work better with more complex regular expressions. --- src/Document.cxx | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/Document.cxx b/src/Document.cxx index f357cd3c7..9854df677 100644 --- a/src/Document.cxx +++ b/src/Document.cxx @@ -853,17 +853,10 @@ long Document::FindText(int minPos, int maxPos, const char *s, if (!pre) return -1; - int startPos; - int endPos; int increment = (minPos <= maxPos) ? 1 : -1; -// if (minPos <= maxPos) { - startPos = minPos; - endPos = maxPos; -// } else { -// startPos = maxPos; -// endPos = minPos; -// } + int startPos = minPos; + int endPos = maxPos; // Range endpoints should not be inside DBCS characters, but just in case, move them. startPos = MovePositionOutsideChar(startPos, 1, false); @@ -923,7 +916,7 @@ long Document::FindText(int minPos, int maxPos, const char *s, if (increment == -1) { // Check for the last match on this line. while (success) { - success = pre->Execute(di, pos + 1, endOfLine); + success = pre->Execute(di, pre->eopat[0], endOfLine); if (success) { if (pre->eopat[0] <= minPos) { pos = pre->bopat[0]; -- cgit v1.2.3