diff options
author | Michael Livshin <mlivshin@bigfoot.com> | 2001-05-28 14:18:35 +0000 |
---|---|---|
committer | Michael Livshin <mlivshin@bigfoot.com> | 2001-05-28 14:18:35 +0000 |
commit | fde504077bf4f73e3f9983de6ae8599d3fbb8895 (patch) | |
tree | 61f5da144f8c1ae4b7262afadc4c94792f41eaf8 /libguile/hooks.c | |
parent | dd85ce4758260f712d0efc806df6643aca8e3b74 (diff) | |
download | guile-fde504077bf4f73e3f9983de6ae8599d3fbb8895.tar.gz |
* hooks.c (scm_create_hook): deprecated.
(make_hook): deleted.
(scm_make_hook): all the hook creation code is now here.
* gc.c (scm_init_gc): don't call `scm_create_hook'. instead make
a hook, make it permanent, and do a `scm_c_define' on it.
Diffstat (limited to 'libguile/hooks.c')
-rw-r--r-- | libguile/hooks.c | 42 |
1 files changed, 18 insertions, 24 deletions
diff --git a/libguile/hooks.c b/libguile/hooks.c index 166394818..737e92353 100644 --- a/libguile/hooks.c +++ b/libguile/hooks.c @@ -150,26 +150,6 @@ scm_c_hook_run (scm_c_hook_t *hook, void *data) scm_bits_t scm_tc16_hook; -static SCM -make_hook (SCM n_args, const char *subr) -{ - int n; - - if (SCM_UNBNDP (n_args)) - { - n = 0; - } - else - { - SCM_ASSERT (SCM_INUMP (n_args), n_args, SCM_ARGn, subr); - n = SCM_INUM (n_args); - if (n < 0 || n > 16) - scm_out_of_range (subr, n_args); - } - SCM_RETURN_NEWSMOB (scm_tc16_hook + (n << 16), SCM_UNPACK (SCM_EOL)); -} - - static int hook_print (SCM hook, SCM port, scm_print_state *pstate) { @@ -193,16 +173,17 @@ hook_print (SCM hook, SCM port, scm_print_state *pstate) return 1; } +#if (SCM_DEBUG_DEPRECATED == 0) SCM scm_create_hook (const char *name, int n_args) { - SCM hook = make_hook (SCM_MAKINUM (n_args), "scm_create_hook"); + SCM hook = scm_make_hook (SCM_MAKINUM (n_args)); scm_c_define (name, hook); - scm_gc_protect_object (hook); /* cmm:FIXME:: qua? */ - return hook; + return scm_permanent_object (hook); } +#endif SCM_DEFINE (scm_make_hook, "make-hook", 0, 1, 0, (SCM n_args), @@ -210,7 +191,20 @@ SCM_DEFINE (scm_make_hook, "make-hook", 0, 1, 0, "@var{n_args}. @var{n_args} defaults to zero.") #define FUNC_NAME s_scm_make_hook { - return make_hook (n_args, FUNC_NAME); + int n; + + if (SCM_UNBNDP (n_args)) + { + n = 0; + } + else + { + SCM_VALIDATE_INUM_COPY (SCM_ARG1, n_args, n); + if (n < 0 || n > 16) + SCM_OUT_OF_RANGE (SCM_ARG1, n_args); + } + + SCM_RETURN_NEWSMOB (scm_tc16_hook + (n << 16), SCM_UNPACK (SCM_EOL)); } #undef FUNC_NAME |