mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-25 09:20:59 -08:00
Code Issues Projects Releases Wiki Activity

Fix bignum bugs with nth, elt, =

Browse source 
* src/bytecode.c (exec_byte_code): Support bignums
when implementing nth, elt, and =.
* src/lisp.h (SMALL_LIST_LEN_MAX): New constant.
* src/fns.c (Fnthcdr): Use it.
(Felt): Do not reject bignum indexes.
This commit is contained in:
Paul Eggert 2018-08-21 11:40:23 -07:00
parent ad31afc35b
commit 81e7eef822
3 changed files with 20 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/bytecode.c
View file

@ -832,13 +832,14 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
CASE (Bnth):
{
Lisp_Object v2 = POP, v1 = TOP;
CHECK_FIXNUM (v1);
for (EMACS_INT n = XFIXNUM (v1); 0 < n && CONSP (v2); n--)
if (RANGED_FIXNUMP (0, v1, SMALL_LIST_LEN_MAX))
{
v2 = XCDR (v2);
rarely_quit (n);
for (EMACS_INT n = XFIXNUM (v1); 0 < n && CONSP (v2); n--)
v2 = XCDR (v2);
TOP = CAR (v2);
}
TOP = CAR (v2);
else
TOP = Fnth (v1, v2);
NEXT;
}
@ -985,15 +986,8 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
CASE (Beqlsign):
{
Lisp_Object v2 = POP, v1 = TOP;
if (FLOATP (v1) || FLOATP (v2))
TOP = arithcompare (v1, v2, ARITH_EQUAL);
else
{
CHECK_FIXNUM_OR_FLOAT_COERCE_MARKER (v1);
CHECK_FIXNUM_OR_FLOAT_COERCE_MARKER (v2);
TOP = EQ (v1, v2) ? Qt : Qnil;
}
Lisp_Object v1 = POP;
TOP = arithcompare (TOP, v1, ARITH_EQUAL);
NEXT;
}
@ -1264,23 +1258,16 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
CASE (Belt):
{
if (CONSP (TOP))
Lisp_Object v2 = POP, v1 = TOP;
if (CONSP (v1) && RANGED_FIXNUMP (0, v2, SMALL_LIST_LEN_MAX))
{
/* Exchange args and then do nth. */
Lisp_Object v2 = POP, v1 = TOP;
CHECK_FIXNUM (v2);
/* Like the fast case for Bnth, but with args reversed. */
for (EMACS_INT n = XFIXNUM (v2); 0 < n && CONSP (v1); n--)
{
v1 = XCDR (v1);
rarely_quit (n);
}
v1 = XCDR (v1);
TOP = CAR (v1);
}
else
{
Lisp_Object v1 = POP;
TOP = Felt (TOP, v1);
}
TOP = Felt (v1, v2);
NEXT;
}