mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-07-05 17:20:18 +02:00
Code Activity

Change to be less sloppy as regards functions without prototypes

Browse source 
* libguile/gsubr.h (scm_t_subr_0, scm_t_subr_1, etc): New precise
typedefs.
(SCM_AS_SUBR): Use C11's _Generic to cast subrs to the generic subr
type, while also producing a warning/error if the function isn't
compatible.
(SCM_DEFINE_GSUBR, SCM_PRIMITIVE_GENERIC, SCM_DEFINE_PUBLIC)
(SCM_DEFINE_STATIC, SCM_PROC, SCM_REGISTER_PROC, SCM_GPROC): Use
SCM_AS_SUBR.
* libguile/gsubr-internal.h (scm_t_subr_with_thread_0)
(scm_t_subr_with_thread_1, etc): New precise typedefs.
(SCM_AS_SUBR_WITH_THREAD): Like SCM_AS_SUBR.
* libguile/gsubr.c (scm_apply_subr): Cast callee to the right type
before calling.
* libguile/hash.c (floor): Remove weird unused declaration.
* libguile/init.c (scm_boot_guile): Fix type of main_func in definition.
* libguile/jit.c: Fix type of enter_mcode.
* libguile/smob.c (apply_0, apply_1, apply_2, apply_3): Cast callee to
right type.
(scm_smob_trampoline): Use SCM_AS_SUBR.
* libguile/smob.h (SCM_SMOB_APPLY): Use SCM_AS_SUBR.
* libguile/backtrace.c:
* libguile/control.c:
* libguile/dynl.c:
* libguile/eval.c:
* libguile/exceptions.c:
* libguile/expand.c:
* libguile/finalizers.c:
* libguile/fluids.c:
* libguile/fports.c:
* libguile/frames.c:
* libguile/gc.c:
* libguile/load.c:
* libguile/loader.c:
* libguile/macros.c:
* libguile/memoize.c:
* libguile/pairs.c:
* libguile/poll.c:
* libguile/ports.c:
* libguile/posix.c:
* libguile/rdelim.c:
* libguile/rw.c:
* libguile/vm.c: Adapt scm_c_make_gsubr / scm_c_define_gsubr callers to
use SCM_AS_SUBR.
This commit is contained in:
Andy Wingo 2025-06-26 15:56:16 +02:00
parent a7d7ff5019
commit c79d5bd0f7
30 changed files with 180 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

88
libguile/gsubr.c
View file

@ -529,48 +529,43 @@ scm_apply_subr (struct scm_thread *t,
SCM (*subr)() = scm_subr_function_by_index (idx);
size_t nargs = scm_subr_has_closure_argument (idx) ? nslots : nslots - 1;
#define ARG(i) (sp[i].as_scm)
#define A(i) (sp[i].as_scm)
if (scm_subr_has_thread_argument (idx))
{
switch (nargs)
{
case 0:
return subr (t);
return ((scm_t_subr_with_thread_0) subr) (t);
case 1:
return subr (t,
ARG (0));
return ((scm_t_subr_with_thread_1) subr)
(t, A (0));
case 2:
return subr (t,
ARG (1), ARG (0));
return ((scm_t_subr_with_thread_2) subr)
(t, A (1), A (0));
case 3:
return subr (t,
ARG (2), ARG (1), ARG (0));
return ((scm_t_subr_with_thread_3) subr)
(t, A (2), A (1), A (0));
case 4:
return subr (t,
ARG (3), ARG (2), ARG (1), ARG (0));
return ((scm_t_subr_with_thread_4) subr)
(t, A (3), A (2), A (1), A (0));
case 5:
return subr (t,
ARG (4), ARG (3), ARG (2), ARG (1), ARG (0));
return ((scm_t_subr_with_thread_5) subr)
(t, A (4), A (3), A (2), A (1), A (0));
case 6:
return subr (t,
ARG (5), ARG (4), ARG (3), ARG (2), ARG (1),
ARG (0));
return ((scm_t_subr_with_thread_6) subr)
(t, A (5), A (4), A (3), A (2), A (1), A (0));
case 7:
return subr (t,
ARG (6), ARG (5), ARG (4), ARG (3), ARG (2),
ARG (1), ARG (0));
return ((scm_t_subr_with_thread_7) subr)
(t, A (6), A (5), A (4), A (3), A (2), A (1), A (0));
case 8:
return subr (t,
ARG (7), ARG (6), ARG (5), ARG (4), ARG (3),
ARG (2), ARG (1), ARG (0));
return ((scm_t_subr_with_thread_8) subr)
(t, A (7), A (6), A (5), A (4), A (3), A (2), A (1), A (0));
case 9:
return subr (t,
ARG (8), ARG (7), ARG (6), ARG (5), ARG (4),
ARG (3), ARG (2), ARG (1), ARG (0));
return ((scm_t_subr_with_thread_9) subr)
(t, A (8), A (7), A (6), A (5), A (4), A (3), A (2), A (1), A (0));
case 10:
return subr (t,
ARG (9), ARG (8), ARG (7), ARG (6), ARG (5),
ARG (4), ARG (3), ARG (2), ARG (1), ARG (0));
return ((scm_t_subr_with_thread_10) subr)
(t, A (9), A (8), A (7), A (6), A (5), A (4), A (3), A (2), A (1), A (0));
default:
abort (); /* SCM_GSUBR_MAX */
}
@ -580,37 +575,42 @@ scm_apply_subr (struct scm_thread *t,
switch (nargs)
{
case 0:
return subr ();
return ((scm_t_subr_0) subr) ();
case 1:
return subr (ARG (0));
return ((scm_t_subr_1) subr)
(A (0));
case 2:
return subr (ARG (1), ARG (0));
return ((scm_t_subr_2) subr)
(A (1), A (0));
case 3:
return subr (ARG (2), ARG (1), ARG (0));
return ((scm_t_subr_3) subr)
(A (2), A (1), A (0));
case 4:
return subr (ARG (3), ARG (2), ARG (1), ARG (0));
return ((scm_t_subr_4) subr)
(A (3), A (2), A (1), A (0));
case 5:
return subr (ARG (4), ARG (3), ARG (2), ARG (1), ARG (0));
return ((scm_t_subr_5) subr)
(A (4), A (3), A (2), A (1), A (0));
case 6:
return subr (ARG (5), ARG (4), ARG (3), ARG (2), ARG (1),
ARG (0));
return ((scm_t_subr_6) subr)
(A (5), A (4), A (3), A (2), A (1), A (0));
case 7:
return subr (ARG (6), ARG (5), ARG (4), ARG (3), ARG (2),
ARG (1), ARG (0));
return ((scm_t_subr_7) subr)
(A (6), A (5), A (4), A (3), A (2), A (1), A (0));
case 8:
return subr (ARG (7), ARG (6), ARG (5), ARG (4), ARG (3),
ARG (2), ARG (1), ARG (0));
return ((scm_t_subr_8) subr)
(A (7), A (6), A (5), A (4), A (3), A (2), A (1), A (0));
case 9:
return subr (ARG (8), ARG (7), ARG (6), ARG (5), ARG (4),
ARG (3), ARG (2), ARG (1), ARG (0));
return ((scm_t_subr_9) subr)
(A (8), A (7), A (6), A (5), A (4), A (3), A (2), A (1), A (0));
case 10:
return subr (ARG (9), ARG (8), ARG (7), ARG (6), ARG (5),
ARG (4), ARG (3), ARG (2), ARG (1), ARG (0));
return ((scm_t_subr_10) subr)
(A (9), A (8), A (7), A (6), A (5), A (4), A (3), A (2), A (1), A (0));
default:
abort (); /* SCM_GSUBR_MAX */
}
}
#undef ARG
#undef A
}
SCM