nano-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Nano-devel] [patch] snipping redundant re-searching of regex


From: Benno Schulenberg
Subject: [Nano-devel] [patch] snipping redundant re-searching of regex
Date: Tue, 07 Apr 2015 12:21:09 +0200

Hi all,

I'm proposing to apply the below patch.  I am unable to trigger the
"This is the only occurrence" inside the 'if (ISSET(USE_REGEXP)...)'.
And even if I were able, I think it is a superfluous re-searching of
the regex that will necessarily result in a did-not-find.

What am I overlooking?

Benno


Index: src/search.c
===================================================================
--- src/search.c        (revision 5179)
+++ src/search.c        (working copy)
@@ -479,33 +479,11 @@
 #endif
        FALSE, openfile->current, openfile->current_x, answer, NULL);
 
-    /* Check to see if there's only one occurrence of the string and
-     * we're on it now. */
+    /* If we found something, and we're back at the exact same spot where
+     * we started searching, then this is the only occurrence. */
     if (fileptr == openfile->current && fileptr_x ==
        openfile->current_x && didfind) {
-#ifdef HAVE_REGEX_H
-       /* Do the search again, skipping over the current line, if we're
-        * doing a bol and/or eol regex search ("^", "$", or "^$"), so
-        * that we find one only once per line.  We should only end up
-        * back at the same position if the string isn't found again, in
-        * which case it's the only occurrence. */
-       if (ISSET(USE_REGEXP) && regexp_bol_or_eol(&search_regexp,
-               answer)) {
-           didfind = findnextstr(
-#ifndef DISABLE_SPELLER
-               FALSE,
-#endif
-               TRUE, openfile->current,
-               openfile->current_x, answer, NULL);
-           if (fileptr == openfile->current && fileptr_x ==
-               openfile->current_x && !didfind)
-               statusbar(_("This is the only occurrence"));
-       } else {
-#endif
            statusbar(_("This is the only occurrence"));
-#ifdef HAVE_REGEX_H
-       }
-#endif
     }
 
     openfile->placewewant = xplustabs();
@@ -539,33 +517,11 @@
                FALSE, openfile->current, openfile->current_x,
                last_search, NULL);
 
-       /* Check to see if there's only one occurrence of the string and
-        * we're on it now. */
+       /* If we found something, and we're back at the exact same spot
+        * where we started searching, then this is the only occurrence. */
        if (fileptr == openfile->current && fileptr_x ==
                openfile->current_x && didfind) {
-#ifdef HAVE_REGEX_H
-           /* Do the search again, skipping over the current line, if
-            * we're doing a bol and/or eol regex search ("^", "$", or
-            * "^$"), so that we find one only once per line.  We should
-            * only end up back at the same position if the string isn't
-            * found again, in which case it's the only occurrence. */
-           if (ISSET(USE_REGEXP) && regexp_bol_or_eol(&search_regexp,
-               last_search)) {
-               didfind = findnextstr(
-#ifndef DISABLE_SPELLER
-                       FALSE,
-#endif
-                       TRUE, openfile->current, openfile->current_x,
-                       last_search, NULL);
-               if (fileptr == openfile->current && fileptr_x ==
-                       openfile->current_x && !didfind)
-                   statusbar(_("This is the only occurrence"));
-           } else {
-#endif /* HAVE_REGEX_H */
                statusbar(_("This is the only occurrence"));
-#ifdef HAVE_REGEX_H
-           }
-#endif
        }
     } else
        statusbar(_("No current search pattern"));

-- 
http://www.fastmail.com - Access your email from home and the web




reply via email to

[Prev in Thread] Current Thread [Next in Thread]