Changeset 4357

Timestamp:

10/14/03 00:24:51 (18 years ago)

Author:

piso

Message:

reverseFindMultilineRegExp(): changed algorithm to make it faster.

File:

• trunk/j/src/org/armedbear/j/Search.java (modified) (2 diffs)

trunk/j/src/org/armedbear/j/Search.java

@@ -3 +3 @@
  *
  * Copyright (C) 1998-2002 Peter Graves
- * $Id: Search.java,v 1.6 2003-10-14 00:12:36 piso Exp $
+ * $Id: Search.java,v 1.7 2003-10-14 00:24:51 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -436 +436 @@
             }
         }
-        int startIndex = buffer.getAbsoluteOffset(start);
-        final String s = buffer.getText().substring(0, startIndex);
-        while (startIndex >= 0) {
+        int startIndex = 0;
+        int endIndex = buffer.getAbsoluteOffset(start);
+        final String s = buffer.getText().substring(0, endIndex);
+        REMatch lastMatch = null;
+        while (true) {
             match = findMatch(s, startIndex, -1);
-            if (match != null) {
-                if (!wholeWordsOnly)
-                    break;
-                if (Utilities.isDelimited(buffer.getMode(), s,
-                                          match.getStartIndex(), match.getEndIndex()))
-                    break;
-            }
-            --startIndex;
-        }
-        if (match == null)
+            if (match == null)
+                break;
+            if (!wholeWordsOnly)
+                lastMatch = match;
+            else if (Utilities.isDelimited(buffer.getMode(), s,
+                                             match.getStartIndex(),
+                                             match.getEndIndex()))
+                lastMatch = match;
+            startIndex = match.getStartIndex() + 1;
+        }
+        if (lastMatch == null)
             return null;
+        match = lastMatch;
         return buffer.getPosition(match.getStartIndex());
     }