From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Leo Liu Newsgroups: gmane.emacs.bugs Subject: bug#19434: 24.4; cl-subseq bounding issues Date: Wed, 24 Dec 2014 12:14:22 +0800 Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1419394522 410 80.91.229.3 (24 Dec 2014 04:15:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 24 Dec 2014 04:15:22 +0000 (UTC) To: 19434@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Dec 24 05:15:15 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Y3dLr-0001uK-U2 for geb-bug-gnu-emacs@m.gmane.org; Wed, 24 Dec 2014 05:15:12 +0100 Original-Received: from localhost ([::1]:47016 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y3dLq-0003sc-MU for geb-bug-gnu-emacs@m.gmane.org; Tue, 23 Dec 2014 23:15:10 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55415) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y3dLn-0003qo-Qz for bug-gnu-emacs@gnu.org; Tue, 23 Dec 2014 23:15:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y3dLi-0001uN-RZ for bug-gnu-emacs@gnu.org; Tue, 23 Dec 2014 23:15:07 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:46707) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y3dLi-0001u7-OB for bug-gnu-emacs@gnu.org; Tue, 23 Dec 2014 23:15:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Y3dLi-0007f4-Fs for bug-gnu-emacs@gnu.org; Tue, 23 Dec 2014 23:15:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Leo Liu Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 24 Dec 2014 04:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 19434 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.141939448429408 (code B ref -1); Wed, 24 Dec 2014 04:15:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 24 Dec 2014 04:14:44 +0000 Original-Received: from localhost ([127.0.0.1]:56073 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y3dLP-0007eF-H6 for submit@debbugs.gnu.org; Tue, 23 Dec 2014 23:14:43 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:53627) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y3dLN-0007e7-DH for submit@debbugs.gnu.org; Tue, 23 Dec 2014 23:14:41 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y3dLL-0001of-UX for submit@debbugs.gnu.org; Tue, 23 Dec 2014 23:14:40 -0500 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:45396) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y3dLL-0001ob-Rb for submit@debbugs.gnu.org; Tue, 23 Dec 2014 23:14:39 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55343) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y3dLK-0003ni-QV for bug-gnu-emacs@gnu.org; Tue, 23 Dec 2014 23:14:39 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y3dLF-0001nK-Q4 for bug-gnu-emacs@gnu.org; Tue, 23 Dec 2014 23:14:38 -0500 Original-Received: from mail-pa0-x22b.google.com ([2607:f8b0:400e:c03::22b]:43616) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y3dLF-0001n7-Id for bug-gnu-emacs@gnu.org; Tue, 23 Dec 2014 23:14:33 -0500 Original-Received: by mail-pa0-f43.google.com with SMTP id kx10so9291755pab.30 for ; Tue, 23 Dec 2014 20:14:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:mime-version:content-type; bh=vneLeDexmakxiU01TXv63er6csbQ14XDSabr0p0mr9s=; b=pROr3AbmmXQVZlxkwkcCOjY9oQZZAAiZYR6thB/5IlQ+DZRY+Z02ycA4xZpFyAsBJT q/rjcxxTEN5snhCJBZXCyFjmkEMyBWM5zIeg1rzBog+uBKbrXhU4UPYsHQiOfKeuZ0Gi a2LEy0jvUoKDytLBEboHZYxe7Gyucs1MmyHNztazE2nfMz/l9uo8s4LnnyYIr1gHpP2d bi9Eu6sBrWdl2jIXDFcotObDwzoGxJ79izCrb8hNEDG5m0RcW9vsjUajET0YVqzSg3CD UXrTzO+7BHisivBO9tPUzbQeLAHl5APKqKn7DQHo28+UG8nWR+7QBIDu0s29LeM0pAGT mvRw== X-Received: by 10.68.57.225 with SMTP id l1mr49264335pbq.87.1419394471782; Tue, 23 Dec 2014 20:14:31 -0800 (PST) Original-Received: from Shidais-iMac.local ([128.199.230.246]) by mx.google.com with ESMTPSA id ji5sm5529315pbd.22.2014.12.23.20.14.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Dec 2014 20:14:31 -0800 (PST) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:97694 Archived-At: 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