procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Accept bignum arguments in take and ntake

Browse source 
* src/fns.c (Ftake, Fntake): Accept any integer as first argument, for
completeness.
* test/src/fns-tests.el (fns--take-ntake): Add test cases.
This commit is contained in:
Mattias Engdegård 2022-08-30 16:44:51 +02:00
parent 5cf7b1ada9
commit e1e60e51bf
2 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/fns.c
View file

@ -1563,7 +1563,15 @@ If N is zero or negative, return nil.
If N is greater or equal to the length of LIST, return LIST (or a copy). */)
(Lisp_Object n, Lisp_Object list)
{
CHECK_FIXNUM (n);
if (BIGNUMP (n))
{
if (mpz_sgn (*xbignum_val (n)) < 0)
return Qnil;
CHECK_LIST (list);
return list;
}
if (!FIXNUMP (n))
wrong_type_argument (Qintegerp, n);
EMACS_INT m = XFIXNUM (n);
if (m <= 0)
return Qnil;
@ -1594,7 +1602,15 @@ If N is greater or equal to the length of LIST, return LIST unmodified.
Otherwise, return LIST after truncating it. */)
(Lisp_Object n, Lisp_Object list)
{
CHECK_FIXNUM (n);
if (BIGNUMP (n))
{
if (mpz_sgn (*xbignum_val (n)) < 0)
return Qnil;
CHECK_LIST (list);
return list;
}
if (!FIXNUMP (n))
wrong_type_argument (Qintegerp, n);
EMACS_INT m = XFIXNUM (n);
if (m <= 0)
return Qnil;

10
test/src/fns-tests.el
View file

@ -1412,6 +1412,14 @@
(should (equal (take 5 list) '(a b c b c)))
(should (equal (take 10 list) '(a b c b c b c b c b)))
(should (equal (ntake 10 list) '(a b)))))
(should (equal (ntake 10 list) '(a b))))
;; Bignum N argument.
(let ((list (list 'a 'b 'c)))
(should (equal (take (+ most-positive-fixnum 1) list) '(a b c)))
(should (equal (take (- most-negative-fixnum 1) list) nil))
(should (equal (ntake (+ most-positive-fixnum 1) list) '(a b c)))
(should (equal (ntake (- most-negative-fixnum 1) list) nil))
(should (equal list '(a b c)))))
;;; fns-tests.el ends here