mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-28 07:45:00 +00:00
39d4e1ca21
* lisp/emacs-lisp/range.el: New file. * lisp/gnus/gnus-agent.el (range): (gnus-agent-synchronize-group-flags): (gnus-agent-possibly-alter-active): (gnus-agent-fetch-headers): (gnus-agent-read-agentview): (gnus-agent-fetch-group-1): (gnus-agent-read-p): (gnus-agent-expire-group-1): (gnus-agent-retrieve-headers): Adjust callers. * lisp/gnus/gnus-art.el (range): (gnus-article-describe-bindings): * lisp/gnus/gnus-cloud.el (range): (gnus-cloud-available-chunks): * lisp/gnus/gnus-draft.el (gnus-group-send-queue): * lisp/gnus/gnus-group.el (range): (gnus-group-line-format-alist): (gnus-number-of-unseen-articles-in-group): (gnus-group-update-eval-form): (gnus-group-read-group): (gnus-group-delete-articles): (gnus-group-catchup): (gnus-group-expire-articles-1): (gnus-add-marked-articles): * lisp/gnus/gnus-int.el (gnus-request-marks): * lisp/gnus/gnus-kill.el (gnus-apply-kill-file-internal): * lisp/gnus/gnus-range.el (gnus-range-difference) (gnus-sorted-range-intersection, gnus-uncompress-range) (gnus-add-to-range, gnus-remove-from-range) (gnus-member-of-range, gnus-list-range-intersection) (gnus-list-range-difference, gnus-range-length, gnus-range-add) (gnus-range-map): Make into obsolete aliases. * lisp/gnus/gnus-start.el (gnus-make-articles-unread): (gnus-convert-old-ticks): (gnus-read-old-newsrc-el-file): * lisp/gnus/gnus-sum.el (gnus-select-newsgroup): (gnus-articles-to-read): (gnus-articles-to-read): (gnus-killed-articles): (gnus-adjust-marked-articles): (gnus-update-marks): (gnus-update-marks): (gnus-compute-read-articles): (gnus-list-of-read-articles): (gnus-summary-update-info): (gnus-summary-move-article): (gnus-summary-expire-articles): (gnus-update-read-articles): (gnus-summary-insert-old-articles): (gnus-summary-insert-old-articles): (gnus-summary-insert-old-articles): * lisp/gnus/mail-source.el (gnus-range): (gnus-compress-sequence): * lisp/gnus/nnheader.el (range): (gnus-range-add): (nnheader-update-marks-actions): * lisp/gnus/nnimap.el (nnimap-update-info): (nnimap-update-info): (nnimap-update-info): (nnimap-update-qresync-info): (nnimap-update-qresync-info): (nnimap-update-qresync-info): (nnimap-parse-copied-articles): * lisp/gnus/nnmaildir.el (nnmaildir-request-update-info): (nnmaildir-request-update-info): (nnmaildir-request-expire-articles): (nnmaildir-request-expire-articles): (nnmaildir-request-set-mark): * lisp/gnus/nnmairix.el (nnmairix-request-set-mark): * lisp/gnus/nnmbox.el (nnmbox-record-active-article): (nnmbox-record-deleted-article): * lisp/gnus/nnml.el (nnml-request-compact-group): * lisp/gnus/nnvirtual.el (nnvirtual-request-expire-articles): * lisp/gnus/nnselect.el (numbers-by-group): (nnselect-request-update-info): (nnselect-push-info):
468 lines
15 KiB
EmacsLisp
468 lines
15 KiB
EmacsLisp
;;; ranges.el --- range functions -*- lexical-binding: t; -*-
|
|
|
|
;; Copyright (C) 1996-2022 Free Software Foundation, Inc.
|
|
|
|
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;; A "range" is a list that represents a list of integers. A range is
|
|
;; a list containing cons cells of start/end pairs, as well as integers.
|
|
;;
|
|
;; ((2 . 5) 9 (11 . 13))
|
|
;;
|
|
;; represents the list (2 3 4 5 9 11 12 13).
|
|
|
|
;;; Code:
|
|
|
|
(defun range-normalize (range)
|
|
"Normalize RANGE.
|
|
If RANGE is a single range, return (RANGE). Otherwise, return RANGE."
|
|
(if (listp (cdr-safe range))
|
|
range
|
|
(list range)))
|
|
|
|
(defun range-denormalize (range)
|
|
"If RANGE contains a single range, then return that.
|
|
If not, return RANGE as is."
|
|
(if (and (consp (car range))
|
|
(length= range 1))
|
|
(car range)
|
|
range))
|
|
|
|
(defun range-difference (range1 range2)
|
|
"Return the range of elements in RANGE1 that do not appear in RANGE2.
|
|
Both ranges must be in ascending order."
|
|
(setq range1 (range-normalize range1))
|
|
(setq range2 (range-normalize range2))
|
|
(let* ((new-range (cons nil (copy-sequence range1)))
|
|
(r new-range))
|
|
(while (cdr r)
|
|
(let* ((r1 (cadr r))
|
|
(r2 (car range2))
|
|
(min1 (if (numberp r1) r1 (car r1)))
|
|
(max1 (if (numberp r1) r1 (cdr r1)))
|
|
(min2 (if (numberp r2) r2 (car r2)))
|
|
(max2 (if (numberp r2) r2 (cdr r2))))
|
|
|
|
(cond ((> min1 max1)
|
|
;; Invalid range: may result from overlap condition (below)
|
|
;; remove Invalid range
|
|
(setcdr r (cddr r)))
|
|
((and (= min1 max1)
|
|
(listp r1))
|
|
;; Inefficient representation: may result from overlap
|
|
;; condition (below)
|
|
(setcar (cdr r) min1))
|
|
((not min2)
|
|
;; All done with range2
|
|
(setq r nil))
|
|
((< max1 min2)
|
|
;; No overlap: range1 precedes range2
|
|
(pop r))
|
|
((< max2 min1)
|
|
;; No overlap: range2 precedes range1
|
|
(pop range2))
|
|
((and (<= min2 min1) (<= max1 max2))
|
|
;; Complete overlap: range1 removed
|
|
(setcdr r (cddr r)))
|
|
(t
|
|
(setcdr r (nconc (list (cons min1 (1- min2))
|
|
(cons (1+ max2) max1))
|
|
(cddr r)))))))
|
|
(cdr new-range)))
|
|
|
|
(defun range-intersection (range1 range2)
|
|
"Return intersection of RANGE1 and RANGE2."
|
|
(let* (out
|
|
(min1 (car range1))
|
|
(max1 (if (numberp min1)
|
|
(if (numberp (cdr range1))
|
|
(prog1 (cdr range1)
|
|
(setq range1 nil)) min1)
|
|
(prog1 (cdr min1)
|
|
(setq min1 (car min1)))))
|
|
(min2 (car range2))
|
|
(max2 (if (numberp min2)
|
|
(if (numberp (cdr range2))
|
|
(prog1 (cdr range2)
|
|
(setq range2 nil)) min2)
|
|
(prog1 (cdr min2)
|
|
(setq min2 (car min2))))))
|
|
(setq range1 (cdr range1)
|
|
range2 (cdr range2))
|
|
(while (and min1 min2)
|
|
(cond ((< max1 min2) ; range1 precedes range2
|
|
(setq range1 (cdr range1)
|
|
min1 nil))
|
|
((< max2 min1) ; range2 precedes range1
|
|
(setq range2 (cdr range2)
|
|
min2 nil))
|
|
(t ; some sort of overlap is occurring
|
|
(let ((min (max min1 min2))
|
|
(max (min max1 max2)))
|
|
(setq out (if (= min max)
|
|
(cons min out)
|
|
(cons (cons min max) out))))
|
|
(if (< max1 max2) ; range1 ends before range2
|
|
(setq min1 nil) ; incr range1
|
|
(setq min2 nil)))) ; incr range2
|
|
(unless min1
|
|
(setq min1 (car range1)
|
|
max1 (if (numberp min1) min1
|
|
(prog1 (cdr min1) (setq min1 (car min1))))
|
|
range1 (cdr range1)))
|
|
(unless min2
|
|
(setq min2 (car range2)
|
|
max2 (if (numberp min2) min2
|
|
(prog1 (cdr min2) (setq min2 (car min2))))
|
|
range2 (cdr range2))))
|
|
(cond ((cdr out)
|
|
(nreverse out))
|
|
((numberp (car out))
|
|
out)
|
|
(t
|
|
(car out)))))
|
|
|
|
(defun range-compress-list (numbers)
|
|
"Convert a sorted list of numbers to a range list."
|
|
(let ((first (car numbers))
|
|
(last (car numbers))
|
|
result)
|
|
(cond
|
|
((null numbers)
|
|
nil)
|
|
((not (listp (cdr numbers)))
|
|
numbers)
|
|
(t
|
|
(while numbers
|
|
(cond ((= last (car numbers)) nil) ;Omit duplicated number
|
|
((= (1+ last) (car numbers)) ;Still in sequence
|
|
(setq last (car numbers)))
|
|
(t ;End of one sequence
|
|
(setq result
|
|
(cons (if (= first last) first
|
|
(cons first last))
|
|
result))
|
|
(setq first (car numbers))
|
|
(setq last (car numbers))))
|
|
(setq numbers (cdr numbers)))
|
|
(nreverse (cons (if (= first last) first (cons first last))
|
|
result))))))
|
|
|
|
(defun range-uncompress (ranges)
|
|
"Expand a list of ranges into a list of numbers.
|
|
RANGES is either a single range on the form `(num . num)' or a list of
|
|
these ranges."
|
|
(let (first last result)
|
|
(cond
|
|
((null ranges)
|
|
nil)
|
|
((not (listp (cdr ranges)))
|
|
(setq first (car ranges))
|
|
(setq last (cdr ranges))
|
|
(while (<= first last)
|
|
(setq result (cons first result))
|
|
(setq first (1+ first)))
|
|
(nreverse result))
|
|
(t
|
|
(while ranges
|
|
(if (atom (car ranges))
|
|
(when (numberp (car ranges))
|
|
(setq result (cons (car ranges) result)))
|
|
(setq first (caar ranges))
|
|
(setq last (cdar ranges))
|
|
(while (<= first last)
|
|
(setq result (cons first result))
|
|
(setq first (1+ first))))
|
|
(setq ranges (cdr ranges)))
|
|
(nreverse result)))))
|
|
|
|
(defun range-add-list (ranges list)
|
|
"Return a list of ranges that has all articles from both RANGES and LIST.
|
|
Note: LIST has to be sorted over `<'."
|
|
(if (not ranges)
|
|
(range-compress-list list)
|
|
(setq list (copy-sequence list))
|
|
(unless (listp (cdr ranges))
|
|
(setq ranges (list ranges)))
|
|
(let ((out ranges)
|
|
ilist lowest highest temp)
|
|
(while (and ranges list)
|
|
(setq ilist list)
|
|
(setq lowest (or (and (atom (car ranges)) (car ranges))
|
|
(caar ranges)))
|
|
(while (and list (cdr list) (< (cadr list) lowest))
|
|
(setq list (cdr list)))
|
|
(when (< (car ilist) lowest)
|
|
(setq temp list)
|
|
(setq list (cdr list))
|
|
(setcdr temp nil)
|
|
(setq out (nconc (range-compress-list ilist) out)))
|
|
(setq highest (or (and (atom (car ranges)) (car ranges))
|
|
(cdar ranges)))
|
|
(while (and list (<= (car list) highest))
|
|
(setq list (cdr list)))
|
|
(setq ranges (cdr ranges)))
|
|
(when list
|
|
(setq out (nconc (range-compress-list list) out)))
|
|
(setq out (sort out (lambda (r1 r2)
|
|
(< (or (and (atom r1) r1) (car r1))
|
|
(or (and (atom r2) r2) (car r2))))))
|
|
(setq ranges out)
|
|
(while ranges
|
|
(if (atom (car ranges))
|
|
(when (cdr ranges)
|
|
(if (atom (cadr ranges))
|
|
(when (= (1+ (car ranges)) (cadr ranges))
|
|
(setcar ranges (cons (car ranges)
|
|
(cadr ranges)))
|
|
(setcdr ranges (cddr ranges)))
|
|
(when (= (1+ (car ranges)) (caadr ranges))
|
|
(setcar (cadr ranges) (car ranges))
|
|
(setcar ranges (cadr ranges))
|
|
(setcdr ranges (cddr ranges)))))
|
|
(when (cdr ranges)
|
|
(if (atom (cadr ranges))
|
|
(when (= (1+ (cdar ranges)) (cadr ranges))
|
|
(setcdr (car ranges) (cadr ranges))
|
|
(setcdr ranges (cddr ranges)))
|
|
(when (= (1+ (cdar ranges)) (caadr ranges))
|
|
(setcdr (car ranges) (cdadr ranges))
|
|
(setcdr ranges (cddr ranges))))))
|
|
(setq ranges (cdr ranges)))
|
|
out)))
|
|
|
|
(defun range-remove (range1 range2)
|
|
"Return a range that has all articles from RANGE2 removed from RANGE1.
|
|
The returned range is always a list. RANGE2 can also be a unsorted
|
|
list of articles. RANGE1 is modified by side effects, RANGE2 is not
|
|
modified."
|
|
(if (or (null range1) (null range2))
|
|
range1
|
|
(let (out r1 r2 r1-min r1-max r2-min r2-max
|
|
(range2 (copy-tree range2)))
|
|
(setq range1 (if (listp (cdr range1)) range1 (list range1))
|
|
range2 (sort (if (listp (cdr range2)) range2 (list range2))
|
|
(lambda (e1 e2)
|
|
(< (if (consp e1) (car e1) e1)
|
|
(if (consp e2) (car e2) e2))))
|
|
r1 (car range1)
|
|
r2 (car range2)
|
|
r1-min (if (consp r1) (car r1) r1)
|
|
r1-max (if (consp r1) (cdr r1) r1)
|
|
r2-min (if (consp r2) (car r2) r2)
|
|
r2-max (if (consp r2) (cdr r2) r2))
|
|
(while (and range1 range2)
|
|
(cond ((< r2-max r1-min) ; r2 < r1
|
|
(pop range2)
|
|
(setq r2 (car range2)
|
|
r2-min (if (consp r2) (car r2) r2)
|
|
r2-max (if (consp r2) (cdr r2) r2)))
|
|
((and (<= r2-min r1-min) (<= r1-max r2-max)) ; r2 overlap r1
|
|
(pop range1)
|
|
(setq r1 (car range1)
|
|
r1-min (if (consp r1) (car r1) r1)
|
|
r1-max (if (consp r1) (cdr r1) r1)))
|
|
((and (<= r2-min r1-min) (<= r2-max r1-max)) ; r2 overlap min r1
|
|
(pop range2)
|
|
(setq r1-min (1+ r2-max)
|
|
r2 (car range2)
|
|
r2-min (if (consp r2) (car r2) r2)
|
|
r2-max (if (consp r2) (cdr r2) r2)))
|
|
((and (<= r1-min r2-min) (<= r2-max r1-max)) ; r2 contained in r1
|
|
(if (eq r1-min (1- r2-min))
|
|
(push r1-min out)
|
|
(push (cons r1-min (1- r2-min)) out))
|
|
(pop range2)
|
|
(if (< r2-max r1-max) ; finished with r1?
|
|
(setq r1-min (1+ r2-max))
|
|
(pop range1)
|
|
(setq r1 (car range1)
|
|
r1-min (if (consp r1) (car r1) r1)
|
|
r1-max (if (consp r1) (cdr r1) r1)))
|
|
(setq r2 (car range2)
|
|
r2-min (if (consp r2) (car r2) r2)
|
|
r2-max (if (consp r2) (cdr r2) r2)))
|
|
((and (<= r2-min r1-max) (<= r1-max r2-max)) ; r2 overlap max r1
|
|
(if (eq r1-min (1- r2-min))
|
|
(push r1-min out)
|
|
(push (cons r1-min (1- r2-min)) out))
|
|
(pop range1)
|
|
(setq r1 (car range1)
|
|
r1-min (if (consp r1) (car r1) r1)
|
|
r1-max (if (consp r1) (cdr r1) r1)))
|
|
((< r1-max r2-min) ; r2 > r1
|
|
(pop range1)
|
|
(if (eq r1-min r1-max)
|
|
(push r1-min out)
|
|
(push (cons r1-min r1-max) out))
|
|
(setq r1 (car range1)
|
|
r1-min (if (consp r1) (car r1) r1)
|
|
r1-max (if (consp r1) (cdr r1) r1)))))
|
|
(when r1
|
|
(if (eq r1-min r1-max)
|
|
(push r1-min out)
|
|
(push (cons r1-min r1-max) out))
|
|
(pop range1))
|
|
(while range1
|
|
(push (pop range1) out))
|
|
(nreverse out))))
|
|
|
|
(defun range-member-p (number ranges)
|
|
"Say whether NUMBER is in RANGES."
|
|
(if (not (listp (cdr ranges)))
|
|
(and (>= number (car ranges))
|
|
(<= number (cdr ranges)))
|
|
(let ((not-stop t))
|
|
(while (and ranges
|
|
(if (numberp (car ranges))
|
|
(>= number (car ranges))
|
|
(>= number (caar ranges)))
|
|
not-stop)
|
|
(when (if (numberp (car ranges))
|
|
(= number (car ranges))
|
|
(and (>= number (caar ranges))
|
|
(<= number (cdar ranges))))
|
|
(setq not-stop nil))
|
|
(setq ranges (cdr ranges)))
|
|
(not not-stop))))
|
|
|
|
(defun range-list-intersection (list ranges)
|
|
"Return a list of numbers in LIST that are members of RANGES.
|
|
oLIST is a sorted list."
|
|
(setq ranges (range-normalize ranges))
|
|
(let (number result)
|
|
(while (setq number (pop list))
|
|
(while (and ranges
|
|
(if (numberp (car ranges))
|
|
(< (car ranges) number)
|
|
(< (cdar ranges) number)))
|
|
(setq ranges (cdr ranges)))
|
|
(when (and ranges
|
|
(if (numberp (car ranges))
|
|
(= (car ranges) number)
|
|
;; (caar ranges) <= number <= (cdar ranges)
|
|
(>= number (caar ranges))))
|
|
(push number result)))
|
|
(nreverse result)))
|
|
|
|
(defun range-list-difference (list ranges)
|
|
"Return a list of numbers in LIST that are not members of RANGES.
|
|
LIST is a sorted list."
|
|
(setq ranges (range-normalize ranges))
|
|
(let (number result)
|
|
(while (setq number (pop list))
|
|
(while (and ranges
|
|
(if (numberp (car ranges))
|
|
(< (car ranges) number)
|
|
(< (cdar ranges) number)))
|
|
(setq ranges (cdr ranges)))
|
|
(when (or (not ranges)
|
|
(if (numberp (car ranges))
|
|
(not (= (car ranges) number))
|
|
;; not ((caar ranges) <= number <= (cdar ranges))
|
|
(< number (caar ranges))))
|
|
(push number result)))
|
|
(nreverse result)))
|
|
|
|
(defun range-length (range)
|
|
"Return the length RANGE would have if uncompressed."
|
|
(cond
|
|
((null range)
|
|
0)
|
|
((not (listp (cdr range)))
|
|
(- (cdr range) (car range) -1))
|
|
(t
|
|
(let ((sum 0))
|
|
(dolist (x range sum)
|
|
(setq sum
|
|
(+ sum (if (consp x) (- (cdr x) (car x) -1) 1))))))))
|
|
|
|
(defun range-concat (range1 range2)
|
|
"Add RANGE2 to RANGE1 (nondestructively)."
|
|
(unless (listp (cdr range1))
|
|
(setq range1 (list range1)))
|
|
(unless (listp (cdr range2))
|
|
(setq range2 (list range2)))
|
|
(let ((item1 (pop range1))
|
|
(item2 (pop range2))
|
|
range item selector)
|
|
(while (or item1 item2)
|
|
(setq selector
|
|
(cond
|
|
((null item1) nil)
|
|
((null item2) t)
|
|
((and (numberp item1) (numberp item2)) (< item1 item2))
|
|
((numberp item1) (< item1 (car item2)))
|
|
((numberp item2) (< (car item1) item2))
|
|
(t (< (car item1) (car item2)))))
|
|
(setq item
|
|
(or
|
|
(let ((tmp1 item) (tmp2 (if selector item1 item2)))
|
|
(cond
|
|
((null tmp1) tmp2)
|
|
((null tmp2) tmp1)
|
|
((and (numberp tmp1) (numberp tmp2))
|
|
(cond
|
|
((eq tmp1 tmp2) tmp1)
|
|
((eq (1+ tmp1) tmp2) (cons tmp1 tmp2))
|
|
((eq (1+ tmp2) tmp1) (cons tmp2 tmp1))
|
|
(t nil)))
|
|
((numberp tmp1)
|
|
(cond
|
|
((and (>= tmp1 (car tmp2)) (<= tmp1 (cdr tmp2))) tmp2)
|
|
((eq (1+ tmp1) (car tmp2)) (cons tmp1 (cdr tmp2)))
|
|
((eq (1- tmp1) (cdr tmp2)) (cons (car tmp2) tmp1))
|
|
(t nil)))
|
|
((numberp tmp2)
|
|
(cond
|
|
((and (>= tmp2 (car tmp1)) (<= tmp2 (cdr tmp1))) tmp1)
|
|
((eq (1+ tmp2) (car tmp1)) (cons tmp2 (cdr tmp1)))
|
|
((eq (1- tmp2) (cdr tmp1)) (cons (car tmp1) tmp2))
|
|
(t nil)))
|
|
((< (1+ (cdr tmp1)) (car tmp2)) nil)
|
|
((< (1+ (cdr tmp2)) (car tmp1)) nil)
|
|
(t (cons (min (car tmp1) (car tmp2))
|
|
(max (cdr tmp1) (cdr tmp2))))))
|
|
(progn
|
|
(if item (push item range))
|
|
(if selector item1 item2))))
|
|
(if selector
|
|
(setq item1 (pop range1))
|
|
(setq item2 (pop range2))))
|
|
(if item (push item range))
|
|
(reverse range)))
|
|
|
|
(defun range-map (func range)
|
|
"Apply FUNC to each value contained by RANGE."
|
|
(setq range (range-normalize range))
|
|
(while range
|
|
(let ((span (pop range)))
|
|
(if (numberp span)
|
|
(funcall func span)
|
|
(let ((first (car span))
|
|
(last (cdr span)))
|
|
(while (<= first last)
|
|
(funcall func first)
|
|
(setq first (1+ first))))))))
|
|
|
|
(provide 'range)
|
|
|
|
;;; range.el ends here
|