mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 03:40:34 +02:00
b071ce2147
Currently failing some guardian tests. * libguile/tags.h: Refactor tagging so that tc3 bits for a pair live in the SCM value, not in the heap words. Do the same for structs. This more rational tagging strategy will make native code generation easier. Note that this means that to check a heap pointer for its type, you first have to ensure that it has the expected tc3, as not all the type bits are on the heap. (SCM_TYP3): Check the SCM tag type, not the bits in the cell. (SCM_HAS_TYP3): New helper. (SCM_I_CONSP): Redefine to just check the typ3. (scm_tcs_cons_imcar, scm_tcs_cons_nimcar, scm_tcs_struct): Remove, as they are no longer necessary. * libguile/array-handle.c (scm_i_array_implementation_for_obj): Check for heap objects before checking type bits, so we don't check pairs. * libguile/evalext.c (scm_self_evaluating_p): * libguile/gc.c (scm_i_tag_name): * libguile/goops.c (scm_class_of) * libguile/hash.c (scm_hasher): * libguile/print.c (iprin1): Adapt to tagging changes. * libguile/gc.c (scm_storage_prehistory): Register all displacements here. There are the same displacements as before, unfortunately. * libguile/list.c (SCM_I_CONS): * libguile/pairs.c (scm_cons): * libguile/pairs.h (scm_is_pair): * libguile/vm-engine.h (CONS): Tag pairs with scm_tc3_pair. * libguile/modules.c (scm_post_boot_init_modules): * libguile/modules.h (SCM_MODULEP): * libguile/struct.c (struct_finalizer_trampoline, scm_i_alloc_struct): (scm_make_vtable_vtable): * libguile/struct.h (SCM_STRUCTP, SCM_STRUCT_VTABLE_DATA): (SCM_STRUCT_VTABLE_SLOTS): * libguile/vm-i-scheme.c (make-struct): Adapt to struct tagging changes. * libguile/numbers.h (SCM_I_INUMP): * module/rnrs/arithmetic/fixnums.scm (fixnum?, inline-fixnum?): Adapt to the new fixnum tag. * libguile/numbers.h (SCM_INEXACTP): Make sure of the tc3 before looking at the cell type.
131 lines
4.9 KiB
C
131 lines
4.9 KiB
C
/* classes: h_files */
|
||
|
||
#ifndef SCM_MODULES_H
|
||
#define SCM_MODULES_H
|
||
|
||
/* Copyright (C) 1998, 2000, 2001, 2002, 2003, 2006, 2007, 2008, 2011, 2012 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
|
||
* as published by the Free Software Foundation; either version 3 of
|
||
* the License, or (at your option) any later version.
|
||
*
|
||
* This library is distributed in the hope that it will be useful, but
|
||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||
* Lesser General Public License for more details.
|
||
*
|
||
* You should have received a copy of the GNU Lesser General Public
|
||
* License along with this library; if not, write to the Free Software
|
||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
||
* 02110-1301 USA
|
||
*/
|
||
|
||
|
||
|
||
#include "libguile/__scm.h"
|
||
|
||
#include "libguile/validate.h"
|
||
|
||
|
||
|
||
SCM_API int scm_module_system_booted_p;
|
||
SCM_API scm_t_bits scm_module_tag;
|
||
|
||
#define SCM_MODULEP(obj) \
|
||
(SCM_STRUCTP (obj) && SCM_CELL_WORD_0 (obj) == scm_module_tag)
|
||
|
||
#define SCM_VALIDATE_MODULE(pos, scm) SCM_MAKE_VALIDATE_MSG (pos, scm, MODULEP, "module")
|
||
|
||
/* NOTE: Indexes of module fields are dependent upon the definition of
|
||
* module-type in boot-9.scm.
|
||
*/
|
||
|
||
#define scm_module_index_obarray 0
|
||
#define scm_module_index_uses 1
|
||
#define scm_module_index_binder 2
|
||
#define scm_module_index_eval_closure 3
|
||
#define scm_module_index_transformer 4
|
||
#define scm_module_index_duplicate_handlers 7
|
||
#define scm_module_index_import_obarray 8
|
||
|
||
#define SCM_MODULE_OBARRAY(module) \
|
||
SCM_PACK (SCM_STRUCT_DATA (module) [scm_module_index_obarray])
|
||
#define SCM_MODULE_USES(module) \
|
||
SCM_PACK (SCM_STRUCT_DATA (module) [scm_module_index_uses])
|
||
#define SCM_MODULE_BINDER(module) \
|
||
SCM_PACK (SCM_STRUCT_DATA (module) [scm_module_index_binder])
|
||
#define SCM_MODULE_EVAL_CLOSURE(module) \
|
||
SCM_PACK (SCM_STRUCT_DATA (module)[scm_module_index_eval_closure])
|
||
#define SCM_MODULE_TRANSFORMER(module) \
|
||
SCM_PACK (SCM_STRUCT_DATA (module)[scm_module_index_transformer])
|
||
#define SCM_MODULE_DUPLICATE_HANDLERS(module) \
|
||
SCM_PACK (SCM_STRUCT_DATA (module)[scm_module_index_duplicate_handlers])
|
||
#define SCM_MODULE_IMPORT_OBARRAY(module) \
|
||
SCM_PACK (SCM_STRUCT_DATA (module)[scm_module_index_import_obarray])
|
||
|
||
|
||
|
||
SCM_API SCM scm_current_module (void);
|
||
SCM_API SCM scm_the_root_module (void);
|
||
SCM_API SCM scm_interaction_environment (void);
|
||
SCM_API SCM scm_set_current_module (SCM module);
|
||
|
||
SCM_API SCM scm_c_call_with_current_module (SCM module,
|
||
SCM (*func)(void *), void *data);
|
||
SCM_API void scm_dynwind_current_module (SCM module);
|
||
|
||
SCM_API SCM scm_module_variable (SCM module, SCM sym);
|
||
SCM_API SCM scm_module_local_variable (SCM module, SCM sym);
|
||
SCM_API SCM scm_module_ensure_local_variable (SCM module, SCM sym);
|
||
|
||
SCM_API SCM scm_c_lookup (const char *name);
|
||
SCM_API SCM scm_c_define (const char *name, SCM val);
|
||
SCM_API SCM scm_lookup (SCM symbol);
|
||
SCM_API SCM scm_define (SCM symbol, SCM val);
|
||
|
||
SCM_API SCM scm_c_module_lookup (SCM module, const char *name);
|
||
SCM_API SCM scm_c_module_define (SCM module, const char *name, SCM val);
|
||
SCM_API SCM scm_module_lookup (SCM module, SCM symbol);
|
||
SCM_API SCM scm_module_define (SCM module, SCM symbol, SCM val);
|
||
SCM_API SCM scm_module_export (SCM module, SCM symbol_list);
|
||
SCM_API SCM scm_module_reverse_lookup (SCM module, SCM variable);
|
||
|
||
SCM_API SCM scm_public_variable (SCM module_name, SCM name);
|
||
SCM_API SCM scm_private_variable (SCM module_name, SCM name);
|
||
SCM_API SCM scm_c_public_variable (const char *module_name, const char *name);
|
||
SCM_API SCM scm_c_private_variable (const char *module_name, const char *name);
|
||
|
||
SCM_API SCM scm_public_lookup (SCM module_name, SCM name);
|
||
SCM_API SCM scm_private_lookup (SCM module_name, SCM name);
|
||
SCM_API SCM scm_c_public_lookup (const char *module_name, const char *name);
|
||
SCM_API SCM scm_c_private_lookup (const char *module_name, const char *name);
|
||
|
||
SCM_API SCM scm_public_ref (SCM module_name, SCM name);
|
||
SCM_API SCM scm_private_ref (SCM module_name, SCM name);
|
||
SCM_API SCM scm_c_public_ref (const char *module_name, const char *name);
|
||
SCM_API SCM scm_c_private_ref (const char *module_name, const char *name);
|
||
|
||
SCM_API SCM scm_c_resolve_module (const char *name);
|
||
SCM_API SCM scm_resolve_module (SCM name);
|
||
SCM_API SCM scm_c_define_module (const char *name,
|
||
void (*init)(void *), void *data);
|
||
SCM_API void scm_c_use_module (const char *name);
|
||
SCM_API void scm_c_export (const char *name, ...);
|
||
|
||
SCM_API SCM scm_module_public_interface (SCM module);
|
||
SCM_API SCM scm_module_import_interface (SCM module, SCM sym);
|
||
SCM_API SCM scm_module_transformer (SCM module);
|
||
SCM_API SCM scm_current_module_transformer (void);
|
||
SCM_API SCM scm_get_pre_modules_obarray (void);
|
||
|
||
SCM_INTERNAL void scm_modules_prehistory (void);
|
||
SCM_INTERNAL void scm_init_modules (void);
|
||
|
||
#endif /* SCM_MODULES_H */
|
||
|
||
/*
|
||
Local Variables:
|
||
c-file-style: "gnu"
|
||
End:
|
||
*/
|