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

fix namespace-require to import for-syntax/for-label provides

Browse Source 
svn: r7530
This commit is contained in:
Matthew Flatt 2007-10-19 16:56:59 +00:00
parent e843842c70
commit 6e06235c69
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/mzscheme/src/module.c
View File

@ -1032,7 +1032,7 @@ static Scheme_Object *dynamic_require_for_syntax(int argc, Scheme_Object *argv[]
static Scheme_Object *do_namespace_require(Scheme_Env *env, int argc, Scheme_Object *argv[], static Scheme_Object *do_namespace_require(Scheme_Env *env, int argc, Scheme_Object *argv[],
int for_exp, int copy, int etonly) int for_exp, int copy, int etonly)
{ {
Scheme_Object *form, *rn, *brn; Scheme_Object *form, *rn, *brn, *et_rn, *dt_rn;
if (!env) if (!env)
env = scheme_get_env(NULL); env = scheme_get_env(NULL);
@ -1047,7 +1047,31 @@ static Scheme_Object *do_namespace_require(Scheme_Env *env, int argc, Scheme_Obj
rn = scheme_make_module_rename(for_exp, mzMOD_RENAME_TOPLEVEL, NULL); rn = scheme_make_module_rename(for_exp, mzMOD_RENAME_TOPLEVEL, NULL);
(void)parse_requires(form, scheme_false, env, rn, rn, NULL, NULL, NULL, NULL, NULL, NULL,
if (!for_exp && !etonly && !copy) {
scheme_prepare_exp_env(env);
et_rn = env->exp_env->rename;
if (!et_rn) {
et_rn = scheme_make_module_rename(1, mzMOD_RENAME_TOPLEVEL, NULL);
env->exp_env->rename = et_rn;
}
dt_rn = env->dt_rename;
if (!dt_rn) {
dt_rn = scheme_make_module_rename(MZ_LABEL_PHASE, mzMOD_RENAME_TOPLEVEL, NULL);
env->dt_rename = dt_rn;
}
} else {
et_rn = NULL;
dt_rn = NULL;
}
(void)parse_requires(form, scheme_false, env,
rn, rn,
et_rn, et_rn,
dt_rn, dt_rn,
NULL, NULL,
NULL, NULL, !etonly, etonly, NULL, 1, copy, 0, NULL); NULL, NULL, !etonly, etonly, NULL, 1, copy, 0, NULL);
brn = env->rename; brn = env->rename;