diff options
| author | Marius Vollmer <mvo@zagadka.de> | 2004-07-23 15:43:02 +0000 |
|---|---|---|
| committer | Marius Vollmer <mvo@zagadka.de> | 2004-07-23 15:43:02 +0000 |
| commit | e11e83f3d99305ada6354cae7123fb8c0e998703 (patch) | |
| tree | 23dccd2a0fd1741abb8561214acadc347036480b /libguile/hooks.c | |
| parent | 928e0f421070bb610f3375d5808a6378d5edfa1b (diff) | |
* deprecated.h, deprecated.c, numbers.h (SCM_INUMP, SCM_NINUMP,
SCM_INUM): Deprecated by reenaming them to SCM_I_INUMP, SCM_I_NINUMP
and SCM_I_INUM, respectively and adding deprecated versions to
deprecated.h and deprecated.c. Changed all uses to either use the
SCM_I_ variants or scm_is_*, scm_to_*, or scm_from_*, as appropriate.
Diffstat (limited to 'libguile/hooks.c')
| -rw-r--r-- | libguile/hooks.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libguile/hooks.c b/libguile/hooks.c index 10a3e6525..1c316ef69 100644 --- a/libguile/hooks.c +++ b/libguile/hooks.c @@ -202,9 +202,9 @@ SCM_DEFINE (scm_add_hook_x, "add-hook!", 2, 1, 0, SCM_ASSERT (scm_is_true (arity = scm_i_procedure_arity (proc)), proc, SCM_ARG2, FUNC_NAME); n_args = SCM_HOOK_ARITY (hook); - if (SCM_INUM (SCM_CAR (arity)) > n_args + if (scm_to_int (SCM_CAR (arity)) > n_args || (scm_is_false (SCM_CADDR (arity)) - && (SCM_INUM (SCM_CAR (arity)) + SCM_INUM (SCM_CADR (arity)) + && (scm_to_int (SCM_CAR (arity)) + scm_to_int (SCM_CADR (arity)) < n_args))) scm_wrong_type_arg (FUNC_NAME, 2, proc); rest = scm_delq_x (proc, SCM_HOOK_PROCEDURES (hook)); @@ -254,7 +254,7 @@ SCM_DEFINE (scm_run_hook, "run-hook", 1, 0, 1, SCM_VALIDATE_HOOK (1, hook); if (scm_ilength (args) != SCM_HOOK_ARITY (hook)) SCM_MISC_ERROR ("Hook ~S requires ~A arguments", - scm_list_2 (hook, SCM_I_MAKINUM (SCM_HOOK_ARITY (hook)))); + scm_list_2 (hook, scm_from_int (SCM_HOOK_ARITY (hook)))); scm_c_run_hook (hook, args); return SCM_UNSPECIFIED; } |