From b2b33168b18c6c4fd65b0e77becba1a66a00dae1 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Fri, 13 May 2011 12:51:56 +0200 Subject: 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. --- libguile/macros.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'libguile/macros.c') diff --git a/libguile/macros.c b/libguile/macros.c index aa6b9cd1c..556e60f57 100644 --- a/libguile/macros.c +++ b/libguile/macros.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995,1996,1997,1998,2000,2001,2002,2003, 2006, 2008, 2009, 2010 Free Software Foundation, Inc. +/* Copyright (C) 1995,1996,1997,1998,2000,2001,2002,2003, 2006, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -64,9 +64,9 @@ scm_i_make_primitive_macro (const char *name, scm_t_macro_primitive fn) { SCM z = scm_words (scm_tc16_macro, 5); SCM_SET_SMOB_DATA_N (z, 1, (scm_t_bits)fn); - SCM_SET_SMOB_DATA_N (z, 2, scm_from_locale_symbol (name)); - SCM_SET_SMOB_DATA_N (z, 3, SCM_BOOL_F); - SCM_SET_SMOB_DATA_N (z, 4, SCM_BOOL_F); + SCM_SET_SMOB_OBJECT_N (z, 2, scm_from_locale_symbol (name)); + SCM_SET_SMOB_OBJECT_N (z, 3, SCM_BOOL_F); + SCM_SET_SMOB_OBJECT_N (z, 4, SCM_BOOL_F); return z; } @@ -104,9 +104,9 @@ SCM_DEFINE (scm_make_syntax_transformer, "make-syntax-transformer", 3, 0, 0, z = scm_words (scm_tc16_macro, 5); SCM_SET_SMOB_DATA_N (z, 1, prim); - SCM_SET_SMOB_DATA_N (z, 2, name); - SCM_SET_SMOB_DATA_N (z, 3, type); - SCM_SET_SMOB_DATA_N (z, 4, binding); + SCM_SET_SMOB_OBJECT_N (z, 2, name); + SCM_SET_SMOB_OBJECT_N (z, 3, type); + SCM_SET_SMOB_OBJECT_N (z, 4, binding); return z; } #undef FUNC_NAME -- cgit v1.2.3