diff options
author | Marius Vollmer <mvo@zagadka.de> | 2001-07-26 21:40:18 +0000 |
---|---|---|
committer | Marius Vollmer <mvo@zagadka.de> | 2001-07-26 21:40:18 +0000 |
commit | 904a077df1a670d386ca114ddb7a8e371684f655 (patch) | |
tree | 62ba0cc7b9226c16c662cf884cb2b6c440529df4 /libguile/struct.c | |
parent | 5b54c4daa124b0d9f9b984f0bf1733ac5ebba4d3 (diff) | |
download | guile-904a077df1a670d386ca114ddb7a8e371684f655.tar.gz |
* tags.h: Update tag system docs.
(scm_tc3_cons_gloc): Renamed to scm_tc3_struct. Changed all uses.
(scm_tcs_cons_gloc): Renamed to scm_tcs_struct. Changed all uses.
(SCM_ECONSP, SCM_NECONSP): Removed. Changed all uses to SCM_CONSP
or SCM_NCONSP, respectively.
* struct.c, struct.h, srcprop.c, procs.c, procprop.c, print.c,
objects.c. modules.c, goops.c, eval.c, debug.c: Changed all uses
of scm_tc3_cond_gloc and scm_tcs_cons_gloc. See above.
* print.c (scm_iprin1): Remove printing of glocs. Do not try to
tell glocs from structs.
* gc.c (scm_gc_mark, scm_gc_sweep): Remove handling of glocs.
* eval.c (scm_m_atbind): Make a list of variables, not glocs.
(scm_ceval, scm_deval): For SCM_IM_BIND, fiddle with variables
instead of with glocs.
(EVALCAR): Do not test for glocs.
(scm_lookupcar, scm_lookupcar1): Do not handle glocs in race
condition.
(scm_unmemocar): Do not handle glocs.
(scm_m_atfop): Memoize as a variable, not as a gloc.
(scm_eval_args, scm_deval_args): Do not handle glocs.
(scm_ceval, scm_deval): Likewise.
* eval.h (SCM_XEVALCAR): Do not test for glocs.
(SCM_GLOC_VAR, SCM_GLOC_VAL, SCM_GLOC_SET_VAL, SCM_GLOC_VAL_LOC):
Removed.
* debug.h, debug.c (scm_make_gloc, scm_gloc_p): Removed.
* dynwind.c (scm_swap_bindings): Likewise.
(scm_dowinds): Updated to recognize lists of variables instead of
lists of glocs.
* __scm.h (SCM_CAUTIOS, SCM_RECKLESS): Update comments.
Diffstat (limited to 'libguile/struct.c')
-rw-r--r-- | libguile/struct.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libguile/struct.c b/libguile/struct.c index e4014a9d5..dfc183e42 100644 --- a/libguile/struct.c +++ b/libguile/struct.c @@ -402,8 +402,8 @@ scm_free_structs (void *dummy1 SCM_UNUSED, } else { - scm_t_bits word0 = SCM_CELL_WORD_0 (obj) - scm_tc3_cons_gloc; - /* access as struct */ + /* XXX - use less explicit code. */ + scm_t_bits word0 = SCM_CELL_WORD_0 (obj) - scm_tc3_struct; scm_t_bits * vtable_data = (scm_t_bits *) word0; scm_t_bits * data = SCM_STRUCT_DATA (obj); scm_t_struct_free free_struct_data @@ -470,7 +470,8 @@ SCM_DEFINE (scm_make_struct, "make-struct", 2, 0, 1, SCM_SET_CELL_WORD_1 (handle, data); SCM_SET_STRUCT_GC_CHAIN (handle, 0); scm_struct_init (handle, layout, data, tail_elts, init); - SCM_SET_CELL_WORD_0 (handle, (scm_t_bits) SCM_STRUCT_DATA (vtable) + scm_tc3_cons_gloc); + SCM_SET_CELL_WORD_0 (handle, + (scm_t_bits) SCM_STRUCT_DATA (vtable) + scm_tc3_struct); SCM_ALLOW_INTS; return handle; } @@ -551,7 +552,7 @@ SCM_DEFINE (scm_make_vtable_vtable, "make-vtable-vtable", 2, 0, 1, SCM_SET_STRUCT_GC_CHAIN (handle, 0); data [scm_vtable_index_layout] = SCM_UNPACK (layout); scm_struct_init (handle, layout, data, tail_elts, scm_cons (layout, init)); - SCM_SET_CELL_WORD_0 (handle, (scm_t_bits) data + scm_tc3_cons_gloc); + SCM_SET_CELL_WORD_0 (handle, (scm_t_bits) data + scm_tc3_struct); SCM_ALLOW_INTS; return handle; } |