diff options
author | Andy Wingo <wingo@pobox.com> | 2011-05-13 12:51:56 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2011-05-13 15:28:08 +0200 |
commit | b2b33168b18c6c4fd65b0e77becba1a66a00dae1 (patch) | |
tree | ca47dc70a7a4f2f7d59b78cb9db2435cd3d98640 /libguile/memoize.c | |
parent | d223c3fcdde81280ea8fb9a4b05897786014bbce (diff) | |
download | guile-b2b33168b18c6c4fd65b0e77becba1a66a00dae1.tar.gz |
more care regarding SCM_PACK and SCM_UNPACK
* libguile/control.c (reify_partial_continuation):
* libguile/eval.c (RETURN_BOOT_CLOSURE):
* libguile/frames.c (scm_frame_num_locals, scm_frame_local_ref)
(scm_frame_local_set_x)
* libguile/frames.h (SCM_FRAME_SET_RETURN_ADDRESS):
(SCM_FRAME_SET_MV_RETURN_ADDRESS, SCM_FRAME_SET_DYNAMIC_LINK):
* libguile/goops.c (scm_class_of, scm_primitive_generic_generic)
(scm_c_extend_primitive_generic, compute_getters_n_setters)
(scm_sys_initialize_object):
* libguile/guardians.c (finalize_guarded):
* libguile/list.c (SCM_I_CONS):
* libguile/macros.c (scm_i_make_primitive_macro)
(scm_make_syntax_transformer):
* libguile/memoize.c (MAKMEMO, SCM_MAKE_MEMOIZER)
(SCM_MAKE_REST_MEMOIZER):
* libguile/modules.c (scm_module_reverse_lookup)
* libguile/print.c (iprin1):
* libguile/promises.c (scm_make_promise)
* libguile/srcprop.c (scm_make_srcprops):
* libguile/vectors.c (scm_c_vector_ref):
* libguile/vm-engine.c (vm_engine)
* libguile/vm-i-scheme.c (REL, add1, sub1):
* libguile/vm-i-system.c (new_frame, call_cc)
* libguile/weaks.h (SCM_WEAK_PAIR_WORD_DELETED_P): Be more careful about
SCM_PACK / SCM_UNPACK.
Diffstat (limited to 'libguile/memoize.c')
-rw-r--r-- | libguile/memoize.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libguile/memoize.c b/libguile/memoize.c index 49d294861..0b1aa5194 100644 --- a/libguile/memoize.c +++ b/libguile/memoize.c @@ -64,7 +64,8 @@ SCM_SYMBOL (sym_case_lambda_star, "case-lambda*"); scm_t_bits scm_tc16_memoized; -#define MAKMEMO(n, args) (scm_cell (scm_tc16_memoized | ((n) << 16), (scm_t_bits)(args))) +#define MAKMEMO(n, args) \ + (scm_cell (scm_tc16_memoized | ((n) << 16), SCM_UNPACK (args))) #define MAKMEMO_BEGIN(exps) \ MAKMEMO (SCM_M_BEGIN, exps) @@ -448,13 +449,13 @@ SCM_DEFINE (scm_memoize_expression, "memoize-expression", 1, 0, 0, #define SCM_MAKE_MEMOIZER(STR, MEMOIZER, N) \ (scm_cell (scm_tc16_memoizer, \ - (scm_t_bits)(scm_c_make_gsubr (STR, N, 0, 0, MEMOIZER)))) + SCM_UNPACK (scm_c_make_gsubr (STR, N, 0, 0, MEMOIZER)))) #define SCM_DEFINE_MEMOIZER(STR, MEMOIZER, N) \ SCM_SNARF_INIT(scm_c_define (STR, SCM_MAKE_MEMOIZER (STR, MEMOIZER, N))) #define SCM_MAKE_REST_MEMOIZER(STR, MEMOIZER, N) \ (scm_cell (scm_tc16_memoizer, \ - (scm_t_bits)(scm_c_make_gsubr (STR, N, 0, 1, MEMOIZER)))) + SCM_UNPACK ((scm_c_make_gsubr (STR, N, 0, 1, MEMOIZER))))) #define SCM_DEFINE_REST_MEMOIZER(STR, MEMOIZER, N) \ SCM_SNARF_INIT(scm_c_define (STR, SCM_MAKE_REST_MEMOIZER (STR, MEMOIZER, N))) |