martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better take and ntake bignum argument handling

Browse Source 
* src/fns.c (Ftake, Fntake): Treat positive bignum arguments
as most-positive-fixnum which results in better error checking
of improper lists.
This commit is contained in:
Mattias Engdegård
2022-08-31 14:31:31 +02:00
parent 941627f8d0
commit e7193902b2
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/fns.c
View File

@@ -1563,18 +1563,21 @@ 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)
{
if (BIGNUMP (n))
EMACS_INT m;
if (FIXNUMP (n))
{
m = XFIXNUM (n);
if (m <= 0)
return Qnil;
}
else if (BIGNUMP (n))
{
if (mpz_sgn (*xbignum_val (n)) < 0)
return Qnil;
CHECK_LIST (list);
return list;
m = MOST_POSITIVE_FIXNUM;
}
if (!FIXNUMP (n))
else
wrong_type_argument (Qintegerp, n);
EMACS_INT m = XFIXNUM (n);
if (m <= 0)
return Qnil;
CHECK_LIST (list);
if (NILP (list))
return Qnil;
@@ -1602,18 +1605,21 @@ 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)
{
if (BIGNUMP (n))
EMACS_INT m;
if (FIXNUMP (n))
{
m = XFIXNUM (n);
if (m <= 0)
return Qnil;
}
else if (BIGNUMP (n))
{
if (mpz_sgn (*xbignum_val (n)) < 0)
return Qnil;
CHECK_LIST (list);
return list;
m = MOST_POSITIVE_FIXNUM;
}
if (!FIXNUMP (n))
else
wrong_type_argument (Qintegerp, n);
EMACS_INT m = XFIXNUM (n);
if (m <= 0)
return Qnil;
CHECK_LIST (list);
Lisp_Object tail = list;
--m;