check result of module name resolver

svn: r3598
This commit is contained in:
Matthew Flatt 2006-07-05 15:43:38 +00:00
parent 576ac28822
commit 456d18a712
2 changed files with 9 additions and 2 deletions

View File

@ -1169,9 +1169,11 @@ void scheme_wrong_type(const char *name, const char *expected,
if ((which < 0) || (argc == 1)) if ((which < 0) || (argc == 1))
scheme_raise_exn(MZEXN_FAIL_CONTRACT, scheme_raise_exn(MZEXN_FAIL_CONTRACT,
"%s: expects %s of type <%s>; " "%s: expect%s %s of type <%s>; "
"given %t", "given %t",
name, isress, expected, s, slen); name,
(which < 0) ? "ed" : "s",
isress, expected, s, slen);
else { else {
char *other; char *other;
long olen; long olen;

View File

@ -1804,6 +1804,11 @@ static Scheme_Object *_module_resolve(Scheme_Object *modidx, Scheme_Object *stx,
name = scheme_apply(scheme_get_param(scheme_current_config(), MZCONFIG_CURRENT_MODULE_RESOLVER), 4, a); name = scheme_apply(scheme_get_param(scheme_current_config(), MZCONFIG_CURRENT_MODULE_RESOLVER), 4, a);
if (!SCHEME_SYMBOLP(name)) {
a[0] = name;
scheme_wrong_type("module name resolver", "symbol", -1, -1, a);
}
((Scheme_Modidx *)modidx)->resolved = name; ((Scheme_Modidx *)modidx)->resolved = name;
} }