diff options
| author | Stefan Monnier | 2024-05-28 20:49:55 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2024-05-28 20:53:33 -0400 |
| commit | 3480ca83510f1ad6026971c9031e2c65540d402a (patch) | |
| tree | 9227d714b39f0df11174cf3401f195d7089ade57 /src/data.c | |
| parent | fde8dc9287c0a81c6b942b5cf445f8f7aeba1207 (diff) | |
| download | emacs-3480ca83510f1ad6026971c9031e2c65540d402a.tar.gz emacs-3480ca83510f1ad6026971c9031e2c65540d402a.zip | |
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/data.c')
| -rw-r--r-- | src/data.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/data.c b/src/data.c index e6106a1dbdf..3490d4985c9 100644 --- a/src/data.c +++ b/src/data.c | |||
| @@ -239,7 +239,7 @@ a fixed set of types. */) | |||
| 239 | case PVEC_WINDOW: return Qwindow; | 239 | case PVEC_WINDOW: return Qwindow; |
| 240 | case PVEC_SUBR: | 240 | case PVEC_SUBR: |
| 241 | return XSUBR (object)->max_args == UNEVALLED ? Qspecial_form | 241 | return XSUBR (object)->max_args == UNEVALLED ? Qspecial_form |
| 242 | : SUBR_NATIVE_COMPILEDP (object) ? Qnative_comp_function | 242 | : NATIVE_COMP_FUNCTIONP (object) ? Qnative_comp_function |
| 243 | : Qprimitive_function; | 243 | : Qprimitive_function; |
| 244 | case PVEC_CLOSURE: | 244 | case PVEC_CLOSURE: |
| 245 | return CONSP (AREF (object, CLOSURE_CODE)) | 245 | return CONSP (AREF (object, CLOSURE_CODE)) |
| @@ -908,7 +908,7 @@ signal a `cyclic-function-indirection' error. */) | |||
| 908 | 908 | ||
| 909 | if (!NILP (Vnative_comp_enable_subr_trampolines) | 909 | if (!NILP (Vnative_comp_enable_subr_trampolines) |
| 910 | && SUBRP (function) | 910 | && SUBRP (function) |
| 911 | && !SUBR_NATIVE_COMPILEDP (function)) | 911 | && !NATIVE_COMP_FUNCTIONP (function)) |
| 912 | CALLN (Ffuncall, Qcomp_subr_trampoline_install, symbol); | 912 | CALLN (Ffuncall, Qcomp_subr_trampoline_install, symbol); |
| 913 | #endif | 913 | #endif |
| 914 | 914 | ||
| @@ -1059,7 +1059,7 @@ DEFUN ("native-comp-function-p", Fnative_comp_function_p, Snative_comp_function_ | |||
| 1059 | 0, doc: /* Return t if the object is native compiled Lisp function, nil otherwise. */) | 1059 | 0, doc: /* Return t if the object is native compiled Lisp function, nil otherwise. */) |
| 1060 | (Lisp_Object object) | 1060 | (Lisp_Object object) |
| 1061 | { | 1061 | { |
| 1062 | return SUBR_NATIVE_COMPILEDP (object) ? Qt : Qnil; | 1062 | return NATIVE_COMP_FUNCTIONP (object) ? Qt : Qnil; |
| 1063 | } | 1063 | } |
| 1064 | 1064 | ||
| 1065 | DEFUN ("subr-native-lambda-list", Fsubr_native_lambda_list, | 1065 | DEFUN ("subr-native-lambda-list", Fsubr_native_lambda_list, |
| @@ -1071,7 +1071,7 @@ function or t otherwise. */) | |||
| 1071 | CHECK_SUBR (subr); | 1071 | CHECK_SUBR (subr); |
| 1072 | 1072 | ||
| 1073 | #ifdef HAVE_NATIVE_COMP | 1073 | #ifdef HAVE_NATIVE_COMP |
| 1074 | if (SUBR_NATIVE_COMPILED_DYNP (subr)) | 1074 | if (NATIVE_COMP_FUNCTION_DYNP (subr)) |
| 1075 | return XSUBR (subr)->lambda_list; | 1075 | return XSUBR (subr)->lambda_list; |
| 1076 | #endif | 1076 | #endif |
| 1077 | return Qt; | 1077 | return Qt; |
| @@ -1148,7 +1148,7 @@ Value, if non-nil, is a list (interactive SPEC). */) | |||
| 1148 | 1148 | ||
| 1149 | if (SUBRP (fun)) | 1149 | if (SUBRP (fun)) |
| 1150 | { | 1150 | { |
| 1151 | if (SUBR_NATIVE_COMPILEDP (fun) && !NILP (XSUBR (fun)->intspec.native)) | 1151 | if (NATIVE_COMP_FUNCTIONP (fun) && !NILP (XSUBR (fun)->intspec.native)) |
| 1152 | return XSUBR (fun)->intspec.native; | 1152 | return XSUBR (fun)->intspec.native; |
| 1153 | 1153 | ||
| 1154 | const char *spec = XSUBR (fun)->intspec.string; | 1154 | const char *spec = XSUBR (fun)->intspec.string; |