diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2024-05-28 20:49:55 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2024-05-28 20:53:33 -0400 |
| commit | 3480ca83510f1ad6026971c9031e2c65540d402a (patch) | |
| tree | 9227d714b39f0df11174cf3401f195d7089ade57 /src/eval.c | |
| parent | fde8dc9287c0a81c6b942b5cf445f8f7aeba1207 (diff) | |
Rename `SUBR_NATIVE_COMPILED` to `NATIVE_COMP_FUNCTION` (bug#71123)
Keep the name consistent with the naming used in the ELisp world.
* src/pdumper.c (dump_object_emacs_ptr, dump_do_fixup):
* src/eval.c (eval_sub, funcall_general, funcall_lambda):
* src/alloc.c (CHECK_ALLOCATED_AND_LIVE_SYMBOL, survives_gc_p):
* src/data.c (Fcl_type_of, Ffset, Fnative_comp_function_p)
(Fsubr_native_lambda_list, Finteractive_form):
* src/comp.c (check_comp_unit_relocs):
* src/bytecode.c (exec_byte_code):
* src/lisp.h (NATIVE_COMP_FUNCTIONP, NATIVE_COMP_FUNCTION_DYNP):
Rename from `SUBR_NATIVE_COMPILEDP` and `SUBR_NATIVE_COMPILED_DYNP`.
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/eval.c b/src/eval.c index 20b9ca9a0ec..1e0628b4aa3 100644 --- a/src/eval.c +++ b/src/eval.c @@ -2534,7 +2534,7 @@ eval_sub (Lisp_Object form) else if (!NILP (fun) && (fun = XSYMBOL (fun)->u.s.function, SYMBOLP (fun))) fun = indirect_function (fun); - if (SUBRP (fun) && !SUBR_NATIVE_COMPILED_DYNP (fun)) + if (SUBRP (fun) && !NATIVE_COMP_FUNCTION_DYNP (fun)) { Lisp_Object args_left = original_args; ptrdiff_t numargs = list_length (args_left); @@ -2640,7 +2640,7 @@ eval_sub (Lisp_Object form) } } else if (CLOSUREP (fun) - || SUBR_NATIVE_COMPILED_DYNP (fun) + || NATIVE_COMP_FUNCTION_DYNP (fun) || MODULE_FUNCTIONP (fun)) return apply_lambda (fun, original_args, count); else @@ -3036,10 +3036,10 @@ funcall_general (Lisp_Object fun, ptrdiff_t numargs, Lisp_Object *args) && (fun = XSYMBOL (fun)->u.s.function, SYMBOLP (fun))) fun = indirect_function (fun); - if (SUBRP (fun) && !SUBR_NATIVE_COMPILED_DYNP (fun)) + if (SUBRP (fun) && !NATIVE_COMP_FUNCTION_DYNP (fun)) return funcall_subr (XSUBR (fun), numargs, args); else if (CLOSUREP (fun) - || SUBR_NATIVE_COMPILED_DYNP (fun) + || NATIVE_COMP_FUNCTION_DYNP (fun) || MODULE_FUNCTIONP (fun)) return funcall_lambda (fun, numargs, args); else @@ -3262,7 +3262,7 @@ funcall_lambda (Lisp_Object fun, ptrdiff_t nargs, Lisp_Object *arg_vector) return funcall_module (fun, nargs, arg_vector); #endif #ifdef HAVE_NATIVE_COMP - else if (SUBR_NATIVE_COMPILED_DYNP (fun)) + else if (NATIVE_COMP_FUNCTION_DYNP (fun)) { syms_left = XSUBR (fun)->lambda_list; lexenv = Qnil; @@ -3335,9 +3335,9 @@ funcall_lambda (Lisp_Object fun, ptrdiff_t nargs, Lisp_Object *arg_vector) Lisp_Object val; if (CONSP (fun)) val = Fprogn (XCDR (XCDR (fun))); - else if (SUBR_NATIVE_COMPILEDP (fun)) + else if (NATIVE_COMP_FUNCTIONP (fun)) { - eassert (SUBR_NATIVE_COMPILED_DYNP (fun)); + eassert (NATIVE_COMP_FUNCTION_DYNP (fun)); /* No need to use funcall_subr as we have zero arguments by construction. */ val = XSUBR (fun)->function.a0 (); |