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

fix submodule export of enclosing module's binding

Browse Source 
When `x` and `x`-with-a-mark are both defined, then the order of
definitions affected the binding that `(provide x)` would export
in a submodule that uses `#f` as its language. The problem was
in the implementation of the implicit `require`, which needs to
look up a variable's symbolic name in two different environments
to set up the right mapping.
This commit is contained in:
Matthew Flatt 2014-07-23 16:05:14 +01:00
parent bf748a03c9
commit a95e279219
2 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/racket-pkgs/racket-test/tests/racket/submodule.rktl
View File

@ -894,6 +894,33 @@
(module foo racket/base)
(require (for-label (submod "." foo))))
;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Make sure that submodule exports the right binding
(module provides-id-not-id* racket/base
(require (for-syntax racket/base))
(define-syntax (m stx)
(syntax-case stx ()
[(_ id)
(with-syntax ([id* (datum->syntax #f (syntax-e #'id))])
#'(begin
(define id* 'no)
(define id 'yes)))]))
(m x)
(module* sub #f
(provide x)))
(module uses-id-not-id* racket/base
(require (submod 'provides-id-not-id* sub))
(define answer x)
(provide answer))
(test 'yes dynamic-require ''uses-id-not-id* 'answer)
;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(report-errs)

11
racket/src/racket/src/module.c
View File

@ -7832,7 +7832,7 @@ static void propagate_imports(Module_Begin_Expand_State *bxs,
Scheme_Object *phase, *super_name, *name, *super_vec, *vec;
Scheme_Object *l, *v, *super_defs, *key, *val;
int i, j;
Scheme_Env *super_def_genv;
Scheme_Env *super_def_genv, *def_genv;
ht = super_bxs->tables;
for (i = ht->size; i--; ) {
@ -7895,6 +7895,7 @@ static void propagate_imports(Module_Begin_Expand_State *bxs,
super_defs = val;
super_def_genv = find_env(super_genv, SCHEME_INT_VAL(phase));
def_genv = find_env(genv, SCHEME_INT_VAL(phase));
required = (Scheme_Hash_Table *)get_required_from_tables(bxs->tables,
scheme_bin_plus(phase, phase_shift));
@ -7910,7 +7911,7 @@ static void propagate_imports(Module_Begin_Expand_State *bxs,
SCHEME_VEC_ELS(vec)[1] = to_idx;
v = scheme_tl_id_sym(super_def_genv, name, NULL, 2, NULL, NULL);
SCHEME_VEC_ELS(vec)[2] = v;
if (scheme_lookup_in_table(super_def_genv->toplevel, (char *)name))
if (scheme_lookup_in_table(super_def_genv->toplevel, (char *)v))
SCHEME_VEC_ELS(vec)[3] = scheme_true;
else
SCHEME_VEC_ELS(vec)[3] = scheme_false;
@ -7920,9 +7921,9 @@ static void propagate_imports(Module_Begin_Expand_State *bxs,
SCHEME_VEC_ELS(vec)[6] = name;
SCHEME_VEC_ELS(vec)[7] = scheme_true; /* can be shadowed */
SCHEME_VEC_ELS(vec)[8] = phase;
name = SCHEME_STX_VAL(name); /* is this right? */
scheme_hash_set(required, name, vec);
v = scheme_tl_id_sym(def_genv, name, NULL, 2, NULL, NULL);
scheme_hash_set(required, v, vec);
}
}
}