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

* src/fns.c (mapcar1): Test types in rough order of likelyhood.

Browse source
This commit is contained in:
Mattias Engdegård 2022-06-16 16:04:48 +02:00
parent 946d70a891
commit a0f7d81a8d
1 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/fns.c
View file

@ -2757,7 +2757,22 @@ usage: (nconc &rest LISTS) */)
static EMACS_INT
mapcar1 (EMACS_INT leni, Lisp_Object *vals, Lisp_Object fn, Lisp_Object seq)
{
if (VECTORP (seq) || COMPILEDP (seq))
if (NILP (seq))
return 0;
else if (CONSP (seq))
{
Lisp_Object tail = seq;
for (ptrdiff_t i = 0; i < leni; i++)
{
if (! CONSP (tail))
return i;
Lisp_Object dummy = call1 (fn, XCAR (tail));
if (vals)
vals[i] = dummy;
tail = XCDR (tail);
}
}
else if (VECTORP (seq) || COMPILEDP (seq))
{
for (ptrdiff_t i = 0; i < leni; i++)
{
@ -2766,15 +2781,6 @@ mapcar1 (EMACS_INT leni, Lisp_Object *vals, Lisp_Object fn, Lisp_Object seq)
vals[i] = dummy;
}
}
else if (BOOL_VECTOR_P (seq))
{
for (EMACS_INT i = 0; i < leni; i++)
{
Lisp_Object dummy = call1 (fn, bool_vector_ref (seq, i));
if (vals)
vals[i] = dummy;
}
}
else if (STRINGP (seq))
{
ptrdiff_t i_byte = 0;
@ -2788,17 +2794,14 @@ mapcar1 (EMACS_INT leni, Lisp_Object *vals, Lisp_Object fn, Lisp_Object seq)
vals[i_before] = dummy;
}
}
else /* Must be a list, since Flength did not get an error */
else
{
Lisp_Object tail = seq;
for (ptrdiff_t i = 0; i < leni; i++)
eassert (BOOL_VECTOR_P (seq));
for (EMACS_INT i = 0; i < leni; i++)
{
if (! CONSP (tail))
return i;
Lisp_Object dummy = call1 (fn, XCAR (tail));
Lisp_Object dummy = call1 (fn, bool_vector_ref (seq, i));
if (vals)
vals[i] = dummy;
tail = XCDR (tail);
}
}