suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix double initialization of paramz key

Browse Source 
svn: r17883
This commit is contained in:
Kevin Tew 2010-01-29 14:21:25 +00:00
parent 2d2a95de1e
commit d634beb1eb
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mzscheme/src/env.c
View File

@ -508,13 +508,15 @@ static Scheme_Env *place_instance_init(void *stack_base, int initial_main_os_thr
#endif #endif
scheme_init_error_config(); scheme_init_error_config();
/* BEGIN PRIMITIVE MODULES */
scheme_init_memtrace(env); scheme_init_memtrace(env);
#ifndef NO_TCP_SUPPORT #ifndef NO_TCP_SUPPORT
scheme_init_network(env); scheme_init_network(env);
#endif #endif
scheme_init_parameterization(env); scheme_init_paramz(env);
scheme_init_expand_observe(env); scheme_init_expand_observe(env);
scheme_init_place(env); scheme_init_place(env);
/* END PRIMITIVE MODULES */
#if defined(MZ_USE_PLACES) #if defined(MZ_USE_PLACES)
scheme_jit_fill_threadlocal_table(); scheme_jit_fill_threadlocal_table();
#endif #endif
@ -631,6 +633,7 @@ static void make_kernel_env(void)
#ifndef NO_REGEXP_UTILS #ifndef NO_REGEXP_UTILS
MZTIMEIT(regexp, scheme_regexp_initialize(env)); MZTIMEIT(regexp, scheme_regexp_initialize(env));
#endif #endif
scheme_init_parameterization();
MARK_START_TIME(); MARK_START_TIME();

3
src/mzscheme/src/schpriv.h
View File

@ -238,7 +238,8 @@ void scheme_init_salloc(void);
void scheme_init_jit(void); void scheme_init_jit(void);
#endif #endif
void scheme_init_memtrace(Scheme_Env *env); void scheme_init_memtrace(Scheme_Env *env);
void scheme_init_parameterization(Scheme_Env *env); void scheme_init_paramz(Scheme_Env *env);
void scheme_init_parameterization();
void scheme_init_getenv(void); void scheme_init_getenv(void);
void scheme_init_inspector(void); void scheme_init_inspector(void);

11
src/mzscheme/src/thread.c
View File

@ -850,17 +850,20 @@ Scheme_Object *scheme_get_current_inspector()
return scheme_get_param(c, MZCONFIG_INSPECTOR); return scheme_get_param(c, MZCONFIG_INSPECTOR);
} }
void scheme_init_parameterization(Scheme_Env *env) void scheme_init_parameterization()
{ {
Scheme_Object *v;
Scheme_Env *newenv;
REGISTER_SO(scheme_exn_handler_key); REGISTER_SO(scheme_exn_handler_key);
REGISTER_SO(scheme_parameterization_key); REGISTER_SO(scheme_parameterization_key);
REGISTER_SO(scheme_break_enabled_key); REGISTER_SO(scheme_break_enabled_key);
scheme_exn_handler_key = scheme_make_symbol("exnh"); scheme_exn_handler_key = scheme_make_symbol("exnh");
scheme_parameterization_key = scheme_make_symbol("paramz"); scheme_parameterization_key = scheme_make_symbol("paramz");
scheme_break_enabled_key = scheme_make_symbol("break-on?"); scheme_break_enabled_key = scheme_make_symbol("break-on?");
}
void scheme_init_paramz(Scheme_Env *env)
{
Scheme_Object *v;
Scheme_Env *newenv;
v = scheme_intern_symbol("#%paramz"); v = scheme_intern_symbol("#%paramz");
newenv = scheme_primitive_module(v, env); newenv = scheme_primitive_module(v, env);