diff --git a/src/racket/src/module.c b/src/racket/src/module.c index f5878c61d0..546bc3e8dc 100644 --- a/src/racket/src/module.c +++ b/src/racket/src/module.c @@ -236,7 +236,6 @@ THREAD_LOCAL_DECL(static Scheme_Object *global_shift_cache); # define SHIFT_CACHE_NULLP(x) !(x) #endif -#define SCHEME_MODNAMEP(obj) SAME_TYPE(SCHEME_TYPE(obj), scheme_resolved_module_path_type) #define SCHEME_RMP_VAL(obj) SCHEME_PTR_VAL(obj) typedef void (*Check_Func)(Scheme_Object *prnt_name, Scheme_Object *name, diff --git a/src/racket/src/place.c b/src/racket/src/place.c index 43d43c2d1b..4e8f6e5e6c 100644 --- a/src/racket/src/place.c +++ b/src/racket/src/place.c @@ -309,8 +309,8 @@ Scheme_Object *scheme_place(int argc, Scheme_Object *args[]) { out_arg = args[3]; err_arg = args[4]; - if (!scheme_is_module_path(args[0]) && !SCHEME_PATHP(args[0])) { - scheme_wrong_type("dynamic-place", "module-path or path", 0, argc, args); + if (!scheme_is_module_path(args[0]) && !SCHEME_PATHP(args[0]) && !SCHEME_MODNAMEP(args[0])) { + scheme_wrong_type("dynamic-place", "module-path or path of resolved-module-path", 0, argc, args); } if (!SCHEME_SYMBOLP(args[1])) { scheme_wrong_type("dynamic-place", "symbol", 1, argc, args); diff --git a/src/racket/src/schpriv.h b/src/racket/src/schpriv.h index ef12d2e4df..5f87b77637 100644 --- a/src/racket/src/schpriv.h +++ b/src/racket/src/schpriv.h @@ -3176,6 +3176,8 @@ Scheme_Object *scheme_modidx_shift(Scheme_Object *modidx, Scheme_Object *shift_to_modidx); #define SCHEME_RMPP(o) (SAME_TYPE(SCHEME_TYPE((o)), scheme_resolved_module_path_type)) +#define SCHEME_MODNAMEP(obj) (SAME_TYPE(SCHEME_TYPE(obj), scheme_resolved_module_path_type)) + Scheme_Object *scheme_intern_resolved_module_path(Scheme_Object *o); Scheme_Object *scheme_resolved_module_path_value(Scheme_Object *rmp); int scheme_resolved_module_path_value_matches(Scheme_Object *rmp, Scheme_Object *o); diff --git a/src/racket/src/validate.c b/src/racket/src/validate.c index f9904a1bb7..ff619e546e 100644 --- a/src/racket/src/validate.c +++ b/src/racket/src/validate.c @@ -881,7 +881,6 @@ static void module_validate(Scheme_Object *data, Mz_CPort *port, m = (Scheme_Module *)data; -# define SCHEME_MODNAMEP(obj) SAME_TYPE(SCHEME_TYPE(obj), scheme_resolved_module_path_type) if (!SCHEME_MODNAMEP(m->modname)) scheme_ill_formed_code(port);