From: Leo Liu <sdl.web@gmail.com>
To: 19434@debbugs.gnu.org
Subject: bug#19434: 24.4; cl-subseq bounding issues
Date: Wed, 24 Dec 2014 12:14:22 +0800 [thread overview]
Message-ID: <m2y4pxvg4h.fsf@gmail.com> (raw)
At the moment (cl-subseq '(1 2 3) 0 5) => (1 2 3 nil nil)
I propose the following fix:
diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el
index a94dcd33..b50c1e6a 100644
--- a/lisp/emacs-lisp/cl-extra.el
+++ b/lisp/emacs-lisp/cl-extra.el
@@ -524,15 +524,21 @@ (defun cl-subseq (seq start &optional end)
`(progn (cl-replace ,seq ,new :start1 ,start :end1 ,end)
,new))))
(if (stringp seq) (substring seq start end)
- (let (len)
+ (let ((orig-start start) (orig-end end) len)
(and end (< end 0) (setq end (+ end (setq len (length seq)))))
(if (< start 0) (setq start (+ start (or len (setq len (length seq))))))
(cond ((listp seq)
- (if (> start 0) (setq seq (nthcdr start seq)))
+ (when (> start 0)
+ (setq seq (nthcdr (1- start) seq))
+ (or seq
+ (error "Bad bounding indices: %s, %s" orig-start orig-end))
+ (setq seq (cdr seq)))
(if end
(let ((res nil))
- (while (>= (setq end (1- end)) start)
+ (while (and seq (>= (setq end (1- end)) start))
(push (pop seq) res))
+ (or (= start end)
+ (error "Bad bounding indices: %s, %s" orig-start orig-end))
(nreverse res))
(copy-sequence seq)))
(t
diff --git a/test/automated/cl-lib-tests.el b/test/automated/cl-lib-tests.el
index e4c6e914..162f7aeb 100644
--- a/test/automated/cl-lib-tests.el
+++ b/test/automated/cl-lib-tests.el
@@ -245,4 +245,10 @@ (ert-deftest cl-parse-integer ()
(ert-deftest cl-loop-destructuring-with ()
(should (equal (cl-loop with (a b c) = '(1 2 3) return (+ a b c)) 6)))
+(ert-deftest cl-subseq ()
+ (should-error (cl-subseq '(1 2 3) 4))
+ (should-not (cl-subseq '(1 2 3) 3))
+ (should (cl-subseq '(1 2 3) -3))
+ (should-error (cl-subseq '(1 2 3) 1 4)))
+
;;; cl-lib.el ends here
next reply other threads:[~2014-12-24 4:14 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-24 4:14 Leo Liu [this message]
2015-01-01 16:13 ` bug#19434: 24.4; cl-subseq bounding issues Stefan Monnier
2015-01-04 23:05 ` Leo Liu
2015-01-18 6:21 ` Leo Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m2y4pxvg4h.fsf@gmail.com \
--to=sdl.web@gmail.com \
--cc=19434@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).