diff options
author | Andy Wingo <wingo@pobox.com> | 2011-05-13 15:45:43 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2011-05-13 15:45:43 +0200 |
commit | 86fb1eb631d455aec634aa475a14d2c88052752c (patch) | |
tree | 98936072396a05aa1e4a6d177452f6d5e65a62f5 /libguile/memoize.c | |
parent | fc7bd367ab4b5027a7f80686b1e229c62e43c90b (diff) | |
parent | 2002f1f84797c2c46d0634eabd5ac5fd61e13d73 (diff) | |
download | guile-86fb1eb631d455aec634aa475a14d2c88052752c.tar.gz |
merge strictness branch from 2.0
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))) |