fix bugs related to getting rid of #%expression in fully expanded code

svn: r5615
This commit is contained in:
Matthew Flatt 2007-02-15 08:12:54 +00:00
parent 7a48da5797
commit a5df6154c1
2 changed files with 2 additions and 2 deletions

View File

@ -4077,7 +4077,7 @@ scheme_compile_expand_expr(Scheme_Object *form, Scheme_Comp_Env *env,
/* FIXME: this needs EXPAND_OBSERVE callbacks. */
var = scheme_stx_track(SCHEME_PTR1_VAL(var), form, form);
form = scheme_stx_cert(var, scheme_false, NULL, form, NULL, 1);
if (!rec[drec].comp) {
if (!rec[drec].comp && (rec[drec].depth != -1)) {
/* Already fully expanded. */
return form;
}

View File

@ -4434,7 +4434,7 @@ static Scheme_Object *expression_syntax(Scheme_Object *form, Scheme_Comp_Env *en
static Scheme_Object *expression_expand(Scheme_Object *form, Scheme_Comp_Env *env, Scheme_Expand_Info *erec, int drec)
{
return single_expand(form, scheme_no_defines(env), erec, drec, 0,
!scheme_is_toplevel(env));
!(env->flags & SCHEME_TOPLEVEL_FRAME));
}