diff --git a/src/mzscheme/src/env.c b/src/mzscheme/src/env.c index 73c1d63028..37bd0065fb 100644 --- a/src/mzscheme/src/env.c +++ b/src/mzscheme/src/env.c @@ -391,6 +391,7 @@ static Scheme_Env *place_instance_init_post_kernel() { scheme_init_error_escape_proc(NULL); scheme_init_print_buffers_places(); scheme_init_eval_places(); + scheme_init_regexp_places(); env = scheme_make_empty_env(); scheme_set_param(scheme_current_config(), MZCONFIG_ENV, (Scheme_Object *)env); diff --git a/src/mzscheme/src/regexp.c b/src/mzscheme/src/regexp.c index e647a5b75f..a8217b8d7b 100644 --- a/src/mzscheme/src/regexp.c +++ b/src/mzscheme/src/regexp.c @@ -5545,11 +5545,6 @@ void scheme_regexp_initialize(Scheme_Env *env) GC_REG_TRAV(scheme_rt_regwork, mark_regwork); #endif - REGISTER_SO(regparsestr); - REGISTER_SO(regstr); - REGISTER_SO(regbackknown); - REGISTER_SO(regbackdepends); - GLOBAL_PRIM_W_ARITY("byte-regexp", make_regexp, 1, 1, env); GLOBAL_PRIM_W_ARITY("regexp", make_utf8_regexp, 1, 1, env); GLOBAL_PRIM_W_ARITY("byte-pregexp", make_pregexp, 1, 1, env); @@ -5569,3 +5564,11 @@ void scheme_regexp_initialize(Scheme_Env *env) GLOBAL_FOLDING_PRIM("pregexp?", pregexp_p, 1, 1, 1, env); GLOBAL_FOLDING_PRIM("byte-pregexp?", byte_pregexp_p, 1, 1, 1, env); } + +void scheme_init_regexp_places() +{ + REGISTER_SO(regparsestr); + REGISTER_SO(regstr); + REGISTER_SO(regbackknown); + REGISTER_SO(regbackdepends); +} diff --git a/src/mzscheme/src/schpriv.h b/src/mzscheme/src/schpriv.h index 64bcc9e680..0cf3ef2b66 100644 --- a/src/mzscheme/src/schpriv.h +++ b/src/mzscheme/src/schpriv.h @@ -222,6 +222,8 @@ void scheme_init_place(Scheme_Env *env); void scheme_init_print_buffers_places(void); void scheme_init_eval_places(void); void scheme_init_port_places(void); +void scheme_init_regexp_places(void); + void scheme_free_dynamic_extensions(void);