1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-17 01:00:20 +02:00

* Fixed some type-related errors.

This commit is contained in:
Dirk Herrmann 2000-07-18 16:59:35 +00:00
parent 62850ef3c1
commit 78a3503e56
4 changed files with 16 additions and 7 deletions

View file

@ -1,3 +1,12 @@
2000-07-18 Dirk Herrmann <D.Herrmann@tu-bs.de>
* gc.h (SCM_FREE_CELL_CDR, SCM_SET_FREE_CELL_CDR), hooks.c
(make_hook), modules.c (OBARRAY, USES, BINDER): Pack and unpack
SCM values appropriately.
* modules.c (scm_standard_eval_closure): Don't pass an inum to
scm_makcclo, but rather a long value.
2000-07-18 Dirk Herrmann <D.Herrmann@tu-bs.de> 2000-07-18 Dirk Herrmann <D.Herrmann@tu-bs.de>
read.c (scm_lreadrecparen), srcprop.c (scm_set_source_property_x): read.c (scm_lreadrecparen), srcprop.c (scm_set_source_property_x):

View file

@ -154,11 +154,11 @@ typedef scm_cell * SCM_CELLPTR;
#define SCM_FREE_CELL_P(x) \ #define SCM_FREE_CELL_P(x) \
(!SCM_IMP (x) && (* (const scm_bits_t *) SCM2PTR (x) == scm_tc_free_cell)) (!SCM_IMP (x) && (* (const scm_bits_t *) SCM2PTR (x) == scm_tc_free_cell))
#define SCM_FREE_CELL_CDR(x) \ #define SCM_FREE_CELL_CDR(x) \
(((const scm_bits_t *) SCM2PTR (x)) [1]) (SCM_PACK (((const scm_bits_t *) SCM2PTR (x)) [1]))
#define SCM_SET_FREE_CELL_TYPE(x, v) \ #define SCM_SET_FREE_CELL_TYPE(x, v) \
(((scm_bits_t *) SCM2PTR (x)) [0] = (v)) (((scm_bits_t *) SCM2PTR (x)) [0] = (v))
#define SCM_SET_FREE_CELL_CDR(x, v) \ #define SCM_SET_FREE_CELL_CDR(x, v) \
(((scm_bits_t *) SCM2PTR (x)) [1] = (v)) (((scm_bits_t *) SCM2PTR (x)) [1] = SCM_UNPACK (v))
/* the allocated thing: The car of new cells is set to /* the allocated thing: The car of new cells is set to
scm_tc16_allocated to avoid the fragile state of newcells wrt the scm_tc16_allocated to avoid the fragile state of newcells wrt the

View file

@ -167,7 +167,7 @@ make_hook (SCM n_args, const char *subr)
if (n < 0 || n > 16) if (n < 0 || n > 16)
scm_out_of_range (subr, n_args); scm_out_of_range (subr, n_args);
} }
SCM_RETURN_NEWSMOB (scm_tc16_hook + (n << 16), SCM_EOL); SCM_RETURN_NEWSMOB (scm_tc16_hook + (n << 16), SCM_UNPACK (SCM_EOL));
} }

View file

@ -188,9 +188,9 @@ scm_system_module_env_p (SCM env)
* The code will be replaced by the low-level environments in next release. * The code will be replaced by the low-level environments in next release.
*/ */
#define OBARRAY(module) (SCM_STRUCT_DATA (module) [0]) #define OBARRAY(module) (SCM_PACK (SCM_STRUCT_DATA (module) [0]))
#define USES(module) (SCM_STRUCT_DATA (module) [1]) #define USES(module) (SCM_PACK (SCM_STRUCT_DATA (module) [1]))
#define BINDER(module) (SCM_STRUCT_DATA (module) [2]) #define BINDER(module) (SCM_PACK (SCM_STRUCT_DATA (module) [2]))
static SCM module_make_local_var_x; static SCM module_make_local_var_x;
@ -246,7 +246,7 @@ SCM_DEFINE (scm_standard_eval_closure, "standard-eval-closure", 1, 0, 0,
"") "")
#define FUNC_NAME s_scm_standard_eval_closure #define FUNC_NAME s_scm_standard_eval_closure
{ {
SCM cclo = scm_makcclo (f_eval_closure, SCM_MAKINUM (2)); SCM cclo = scm_makcclo (f_eval_closure, 2);
SCM_VELTS (cclo) [1] = module; SCM_VELTS (cclo) [1] = module;
return cclo; return cclo;
} }