[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/vlf 670561e 031/310: Optimize search a bit.
From: |
Stefan Monnier |
Subject: |
[elpa] externals/vlf 670561e 031/310: Optimize search a bit. |
Date: |
Sat, 28 Nov 2020 00:32:41 -0500 (EST) |
branch: externals/vlf
commit 670561e811077064a29cad2be3ab445a6a3312a1
Author: Andrey Kotlarski <m00naticus@gmail.com>
Commit: Andrey Kotlarski <m00naticus@gmail.com>
Optimize search a bit.
---
vlfi.el | 39 +++++++++++++++++++++------------------
1 file changed, 21 insertions(+), 18 deletions(-)
diff --git a/vlfi.el b/vlfi.el
index 319311f..90ea5ea 100644
--- a/vlfi.el
+++ b/vlfi.el
@@ -277,17 +277,18 @@ OP-TYPE specifies the file operation being performed over
FILENAME."
(if backward
(while (not (zerop to-find))
(cond ((re-search-backward regexp nil t)
- (setq match-start-pos (+ vlfi-start-pos
- (match-beginning 0)))
- (let ((new-match-end (+ vlfi-start-pos
- (match-end 0))))
- (if (< new-match-end match-end-pos)
- (setq to-find (1- to-find)
- match-end-pos new-match-end))))
+ (setq to-find (1- to-find)
+ match-start-pos (+ vlfi-start-pos
+ (match-beginning 0))
+ match-end-pos (+ vlfi-start-pos
+ (match-end 0))))
((zerop vlfi-start-pos)
(throw 'end-of-file nil))
- (t (vlfi-move-to-batch (- vlfi-start-pos
- half-batch))
+ (t (let ((half-move (- vlfi-start-pos half-batch)))
+ (vlfi-move-to-batch
+ (if (< match-start-pos half-move)
+ (- match-start-pos vlfi-batch-size)
+ half-move)))
(goto-char (if (< match-start-pos
vlfi-end-pos)
(- match-start-pos
@@ -297,16 +298,18 @@ OP-TYPE specifies the file operation being performed over
FILENAME."
vlfi-start-pos))))
(while (not (zerop to-find))
(cond ((re-search-forward regexp nil t)
- (setq match-end-pos (+ vlfi-start-pos
- (match-end 0)))
- (let ((new-match-start (+ vlfi-start-pos
- (match-beginning 0))))
- (if (< match-start-pos new-match-start)
- (setq to-find (1- to-find)
- match-start-pos new-match-start))))
+ (setq to-find (1- to-find)
+ match-start-pos (+ vlfi-start-pos
+ (match-beginning 0))
+ match-end-pos (+ vlfi-start-pos
+ (match-end 0))))
((= vlfi-end-pos vlfi-file-size)
(throw 'end-of-file nil))
- (t (vlfi-move-to-batch (- vlfi-end-pos half-batch))
+ (t (let ((half-move (- vlfi-end-pos half-batch)))
+ (vlfi-move-to-batch
+ (if (< half-move match-end-pos)
+ match-end-pos
+ half-move)))
(goto-char (if (< vlfi-start-pos match-end-pos)
(- match-end-pos vlfi-start-pos)
(point-min)))
@@ -341,7 +344,7 @@ successful. Return nil if nothing found."
(defun vlfi-re-search-backward (regexp count)
"Search backward for REGEXP prefix COUNT number of times."
- (interactive (list (read-regexp "Search whole file"
+ (interactive (list (read-regexp "Search whole file backward"
(if regexp-history
(car regexp-history))
'regexp-history)
- [elpa] externals/vlf 78cd8fc 002/310: Add latest changes from GNU ELPA vlf.el., (continued)
- [elpa] externals/vlf 78cd8fc 002/310: Add latest changes from GNU ELPA vlf.el., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf e740b91 005/310: Update `vlf-if-file-too-large' example usage., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf e3087a8 010/310: Rename vlf.el., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf c3051e6 012/310: Show file position in percentages., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf e693e8f 013/310: Disable undo information for VLFI buffers., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf fb9aa67 020/310: Remove clutter form file name indicators., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf c812288 017/310: Fix small issues with forward search and add report progress., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf 090cebc 028/310: Add procedure to insert strictly batch sized chunk (if possible)., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf b40bb60 025/310: Tweaks and fixes to searching., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf 748fd14 027/310: More key-binding simplification., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf 670561e 031/310: Optimize search a bit.,
Stefan Monnier <=
- [elpa] externals/vlf ab20671 033/310: Abstract batch overlapping during search and optimize a bit., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf e387ed5 035/310: Add forgotten local variable statement and documentation., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf 0dd4ba8 014/310: Add regex search forward functionality., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf 9e27aeb 021/310: Keep stable cursor position when moving through chunks., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf 81e4fe1 016/310: Merge branch 'search' of https://github.com/m00natic/vlfi into search, Stefan Monnier, 2020/11/28
- [elpa] externals/vlf e43725e 007/310: Add autoload cookies to fix package installation., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf 853386f 015/310: Add regex search forward functionality., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf 2a7625a 024/310: Improve correctness of search forward., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf c36db11 034/310: Return correct search success status., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf 8a33dbf 036/310: Add something like edit minor mode., Stefan Monnier, 2020/11/28