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

misc clean-up

Browse Source
This commit is contained in:
Matthew Flatt 2012-06-26 22:14:41 -06:00
parent edce1b0406
commit 307ebebcbe
5 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/release-notes/racket/HISTORY.txt
View File

@ -1,7 +1,7 @@
Version 5.3.0.12 Version 5.3.0.12
racket/base: added impersonate-continuation-mark-key, racket/base: added impersonate-continuation-mark-key,
chaperone-continuation-mark-key, make-continuation-mark-key, chaperone-continuation-mark-key, make-continuation-mark-key,
continuation-mark-key? continuation-mark-key?
racket/contract: added prompt-tag/c and continuation-mark-key/c racket/contract: added prompt-tag/c and continuation-mark-key/c
Version 5.3.0.11 Version 5.3.0.11

9
src/racket/src/compenv.c
View File

@ -1888,9 +1888,12 @@ scheme_lookup_binding(Scheme_Object *find_id, Scheme_Comp_Env *env, int flags,
} }
if (!genv) { if (!genv) {
scheme_wrong_syntax("require", NULL, src_find_id, scheme_wrong_syntax("require", NULL, src_find_id,
"namespace mismatch; reference (phase %d) to a module" "namespace mismatch;\n"
" %D that is not available (phase level %d)", " reference to a module that is not available\n"
" reference phase: %d\n"
" referenced module: %D\n"
" referenced phase level: %d",
env->genv->phase, modname, SCHEME_INT_VAL(mod_defn_phase)); env->genv->phase, modname, SCHEME_INT_VAL(mod_defn_phase));
return NULL; return NULL;
} }

30
src/racket/src/eval.c
View File

@ -813,9 +813,12 @@ static Scheme_Object *link_module_variable(Scheme_Object *modidx,
if (!menv) { if (!menv) {
scheme_wrong_syntax("link", NULL, varname, scheme_wrong_syntax("link", NULL, varname,
"namespace mismatch; reference (phase %d) to a module" "namespace mismatch;\n"
" %D that is not available (phase level %d); reference" " reference to a module that is not available\n"
" appears in module: %D", " reference phase: %d\n"
" referenced module: %D\n"
" referenced phase level: %d\n"
" reference in module: %D",
env->phase, env->phase,
modname, modname,
mod_phase, mod_phase,
@ -834,10 +837,11 @@ static Scheme_Object *link_module_variable(Scheme_Object *modidx,
if (self) { if (self) {
exprs[which] = varname; exprs[which] = varname;
} else { } else {
Scheme_Object *v = modname;
if (mod_phase != 0) if (mod_phase != 0)
modname = scheme_make_pair(modname, scheme_make_integer(mod_phase)); v = scheme_make_pair(v, scheme_make_integer(mod_phase));
modname = scheme_make_pair(varname, modname); v = scheme_make_pair(varname, v);
exprs[which] = modname; exprs[which] = v;
} }
} }
@ -845,14 +849,18 @@ static Scheme_Object *link_module_variable(Scheme_Object *modidx,
if (!self) { if (!self) {
if (!bkt->val) { if (!bkt->val) {
scheme_wrong_syntax("link", NULL, varname, scheme_wrong_syntax("link", NULL, varname,
"reference (phase %d) to a variable in module" "bad variable linkage;\n"
" %D that is uninitialized (phase level %d); reference" " reference to a variable that is uninitialized\n"
" appears in module: %D", " reference phase level: %d\n"
" variable module: %D\n"
" variable phase: %d\n"
" reference in module: %D",
env->phase, env->phase,
exprs ? SCHEME_CDR(modname) : modname, modname,
mod_phase, mod_phase,
env->module ? env->module->modsrc : scheme_false); env->module ? env->module->modsrc : scheme_false);
} }
if (!(((Scheme_Bucket_With_Flags *)bkt)->flags & (GLOB_IS_IMMUTATED | GLOB_IS_LINKED))) if (!(((Scheme_Bucket_With_Flags *)bkt)->flags & (GLOB_IS_IMMUTATED | GLOB_IS_LINKED)))
((Scheme_Bucket_With_Flags *)bkt)->flags |= GLOB_IS_LINKED; ((Scheme_Bucket_With_Flags *)bkt)->flags |= GLOB_IS_LINKED;
} }

5
src/racket/src/optimize.c
View File

@ -208,7 +208,10 @@ int scheme_omittable_expr(Scheme_Object *o, int vals, int fuel, int resolved,
-1 for vals means that any return count is ok. -1 for vals means that any return count is ok.
Also used with fully resolved expression by `module' to check Also used with fully resolved expression by `module' to check
for "functional" bodies. for "functional" bodies.
If warn_info is supplied, complain when a mismatch is detected. */ If warn_info is supplied, complain when a mismatch is detected.
If no_id is 1, then an identifier doesn't count as omittable,
unless the identifier is a consistent top-level; currently, this
is used to imply the absece of a continuation-mark impersonator. */
{ {
Scheme_Type vtype; Scheme_Type vtype;

4
src/racket/src/startup.inc
View File

@ -618,7 +618,9 @@
"(read-bytes(max 0(- end start))))))))" "(read-bytes(max 0(- end start))))))))"
"(p(open-input-bytes s)))" "(p(open-input-bytes s)))"
"(let loop()" "(let loop()"
"(let((e(parameterize((read-accept-compiled #t))" "(let((e(parameterize((read-accept-compiled #t)"
"(read-accept-reader #t)"
"(read-accept-lang #t))"
"(read p))))" "(read p))))"
"(unless(eof-object? e)" "(unless(eof-object? e)"
"(eval e)" "(eval e)"