finish removing obsolete namespace-option support

svn: r18083
This commit is contained in:
Matthew Flatt 2010-02-14 14:30:45 +00:00
parent 0e587c15ca
commit 81dbd0a967
8 changed files with 36 additions and 86 deletions

View File

@ -4217,33 +4217,6 @@ static int mark_thread_hop_FIXUP(void *p) {
#define mark_thread_hop_IS_CONST_SIZE 1
static int mark_namespace_option_SIZE(void *p) {
return
gcBYTES_TO_WORDS(sizeof(Scheme_NSO));
}
static int mark_namespace_option_MARK(void *p) {
Scheme_NSO *o = (Scheme_NSO *)p;
gcMARK(o->key);
return
gcBYTES_TO_WORDS(sizeof(Scheme_NSO));
}
static int mark_namespace_option_FIXUP(void *p) {
Scheme_NSO *o = (Scheme_NSO *)p;
gcFIXUP(o->key);
return
gcBYTES_TO_WORDS(sizeof(Scheme_NSO));
}
#define mark_namespace_option_IS_ATOMIC 0
#define mark_namespace_option_IS_CONST_SIZE 1
static int mark_param_data_SIZE(void *p) {
return
gcBYTES_TO_WORDS(sizeof(ParamData));

View File

@ -1721,16 +1721,6 @@ mark_thread_hop {
gcBYTES_TO_WORDS(sizeof(Scheme_Thread_Custodian_Hop));
}
mark_namespace_option {
mark:
Scheme_NSO *o = (Scheme_NSO *)p;
gcMARK(o->key);
size:
gcBYTES_TO_WORDS(sizeof(Scheme_NSO));
}
mark_param_data {
mark:
ParamData *d = (ParamData *)p;

View File

@ -915,7 +915,6 @@ MZ_EXTERN Scheme_Object *scheme_read_byte_string(Scheme_Object *port);
/*========================================================================*/
MZ_EXTERN Scheme_Object *scheme_make_namespace(int argc, Scheme_Object *argv[]);
MZ_EXTERN void scheme_add_namespace_option(Scheme_Object *key, void (*f)(Scheme_Env *));
MZ_EXTERN void scheme_add_global(const char *name, Scheme_Object *val, Scheme_Env *env);
MZ_EXTERN void scheme_add_global_symbol(Scheme_Object *name, Scheme_Object *val,

View File

@ -767,7 +767,6 @@ Scheme_Object *(*scheme_read_byte_string)(Scheme_Object *port);
/* namespace/environment */
/*========================================================================*/
Scheme_Object *(*scheme_make_namespace)(int argc, Scheme_Object *argv[]);
void (*scheme_add_namespace_option)(Scheme_Object *key, void (*f)(Scheme_Env *));
void (*scheme_add_global)(const char *name, Scheme_Object *val, Scheme_Env *env);
void (*scheme_add_global_symbol)(Scheme_Object *name, Scheme_Object *val,
Scheme_Env *env);

View File

@ -537,7 +537,6 @@
scheme_extension_table->scheme_print_string = scheme_print_string;
scheme_extension_table->scheme_read_byte_string = scheme_read_byte_string;
scheme_extension_table->scheme_make_namespace = scheme_make_namespace;
scheme_extension_table->scheme_add_namespace_option = scheme_add_namespace_option;
scheme_extension_table->scheme_add_global = scheme_add_global;
scheme_extension_table->scheme_add_global_symbol = scheme_add_global_symbol;
scheme_extension_table->scheme_make_envunbox = scheme_make_envunbox;

View File

@ -537,7 +537,6 @@
#define scheme_print_string (scheme_extension_table->scheme_print_string)
#define scheme_read_byte_string (scheme_extension_table->scheme_read_byte_string)
#define scheme_make_namespace (scheme_extension_table->scheme_make_namespace)
#define scheme_add_namespace_option (scheme_extension_table->scheme_add_namespace_option)
#define scheme_add_global (scheme_extension_table->scheme_add_global)
#define scheme_add_global_symbol (scheme_extension_table->scheme_add_global_symbol)
#define scheme_make_envunbox (scheme_extension_table->scheme_make_envunbox)

View File

@ -213,43 +213,42 @@ enum {
scheme_rt_tcp, /* 191 */
scheme_rt_write_data, /* 192 */
scheme_rt_tcp_select_info, /* 193 */
scheme_rt_namespace_option, /* 194 */
scheme_rt_param_data, /* 195 */
scheme_rt_will, /* 196 */
scheme_rt_struct_proc_info, /* 197 */
scheme_rt_linker_name, /* 198 */
scheme_rt_param_map, /* 199 */
scheme_rt_finalization, /* 200 */
scheme_rt_finalizations, /* 201 */
scheme_rt_cpp_object, /* 202 */
scheme_rt_cpp_array_object, /* 203 */
scheme_rt_stack_object, /* 204 */
scheme_rt_preallocated_object, /* 205 */
scheme_thread_hop_type, /* 206 */
scheme_rt_srcloc, /* 207 */
scheme_rt_evt, /* 208 */
scheme_rt_syncing, /* 209 */
scheme_rt_comp_prefix, /* 210 */
scheme_rt_user_input, /* 211 */
scheme_rt_user_output, /* 212 */
scheme_rt_compact_port, /* 213 */
scheme_rt_read_special_dw, /* 214 */
scheme_rt_regwork, /* 215 */
scheme_rt_buf_holder, /* 216 */
scheme_rt_parameterization, /* 217 */
scheme_rt_print_params, /* 218 */
scheme_rt_read_params, /* 219 */
scheme_rt_native_code, /* 220 */
scheme_rt_native_code_plus_case, /* 221 */
scheme_rt_jitter_data, /* 222 */
scheme_rt_module_exports, /* 223 */
scheme_rt_delay_load_info, /* 224 */
scheme_rt_marshal_info, /* 225 */
scheme_rt_unmarshal_info, /* 226 */
scheme_rt_runstack, /* 227 */
scheme_rt_sfs_info, /* 228 */
scheme_rt_validate_clearing, /* 229 */
scheme_rt_rb_node, /* 230 */
scheme_rt_param_data, /* 194 */
scheme_rt_will, /* 195 */
scheme_rt_struct_proc_info, /* 196 */
scheme_rt_linker_name, /* 197 */
scheme_rt_param_map, /* 198 */
scheme_rt_finalization, /* 199 */
scheme_rt_finalizations, /* 200 */
scheme_rt_cpp_object, /* 201 */
scheme_rt_cpp_array_object, /* 202 */
scheme_rt_stack_object, /* 203 */
scheme_rt_preallocated_object, /* 204 */
scheme_thread_hop_type, /* 205 */
scheme_rt_srcloc, /* 206 */
scheme_rt_evt, /* 207 */
scheme_rt_syncing, /* 208 */
scheme_rt_comp_prefix, /* 209 */
scheme_rt_user_input, /* 210 */
scheme_rt_user_output, /* 211 */
scheme_rt_compact_port, /* 212 */
scheme_rt_read_special_dw, /* 213 */
scheme_rt_regwork, /* 214 */
scheme_rt_buf_holder, /* 215 */
scheme_rt_parameterization, /* 216 */
scheme_rt_print_params, /* 217 */
scheme_rt_read_params, /* 218 */
scheme_rt_native_code, /* 219 */
scheme_rt_native_code_plus_case, /* 220 */
scheme_rt_jitter_data, /* 221 */
scheme_rt_module_exports, /* 222 */
scheme_rt_delay_load_info, /* 223 */
scheme_rt_marshal_info, /* 224 */
scheme_rt_unmarshal_info, /* 225 */
scheme_rt_runstack, /* 226 */
scheme_rt_sfs_info, /* 227 */
scheme_rt_validate_clearing, /* 228 */
scheme_rt_rb_node, /* 229 */
#endif

View File

@ -399,13 +399,6 @@ typedef struct Scheme_Thread_Custodian_Hop {
SHARED_OK static Scheme_Custodian_Extractor *extractors;
typedef struct {
MZTAG_IF_REQUIRED
Scheme_Object *key;
void (*f)(Scheme_Env *);
} Scheme_NSO;
#define SETJMP(p) scheme_setjmpup(&p->jmpup_buf, p, p->stack_start)
#define LONGJMP(p) scheme_longjmpup(&p->jmpup_buf)
#define RESETJMP(p) scheme_reset_jmpup_buf(&p->jmpup_buf)
@ -7685,7 +7678,6 @@ static void register_traversers(void)
GC_REG_TRAV(scheme_config_type, mark_config);
GC_REG_TRAV(scheme_thread_cell_type, mark_thread_cell);
GC_REG_TRAV(scheme_rt_namespace_option, mark_namespace_option);
GC_REG_TRAV(scheme_rt_param_data, mark_param_data);
GC_REG_TRAV(scheme_rt_will, mark_will);
GC_REG_TRAV(scheme_rt_evt, mark_evt);