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

fix expansion of #%variable-reference

Browse Source 
svn: r1331
This commit is contained in:
Matthew Flatt 2005-11-16 21:36:24 +00:00
parent ec2567b392
commit e078b24e8a
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/mzscheme/src/syntax.c
View File

@ -1445,7 +1445,10 @@ ref_syntax (Scheme_Object *form, Scheme_Comp_Env *env, Scheme_Compile_Info *rec,
} }
if (SCHEME_STX_PAIRP(name)) { if (SCHEME_STX_PAIRP(name)) {
var = scheme_expand_expr(name, env, rec, drec); if (rec[drec].comp)
var = scheme_compile_expr(name, env, rec, drec);
else
var = scheme_expand_expr(name, env, rec, drec);
} else { } else {
scheme_rec_add_certs(rec, drec, form); scheme_rec_add_certs(rec, drec, form);
@ -1463,15 +1466,20 @@ ref_syntax (Scheme_Object *form, Scheme_Comp_Env *env, Scheme_Compile_Info *rec,
if (SAME_TYPE(SCHEME_TYPE(var), scheme_variable_type) if (SAME_TYPE(SCHEME_TYPE(var), scheme_variable_type)
|| SAME_TYPE(SCHEME_TYPE(var), scheme_module_variable_type)) { || SAME_TYPE(SCHEME_TYPE(var), scheme_module_variable_type)) {
var = scheme_register_toplevel_in_prefix(var, env, rec, drec); if (rec[drec].comp)
var = scheme_register_toplevel_in_prefix(var, env, rec, drec);
} else { } else {
scheme_wrong_syntax(NULL, name, form, "identifier does not refer to a top-level or module variable"); scheme_wrong_syntax(NULL, name, form, "identifier does not refer to a top-level or module variable");
} }
scheme_compile_rec_done_local(rec, drec); if (rec[drec].comp)
scheme_compile_rec_done_local(rec, drec);
} }
return scheme_make_syntax_compiled(REF_EXPD, var); if (rec[drec].comp)
return scheme_make_syntax_compiled(REF_EXPD, var);
else
return scheme_void;
} }
static Scheme_Object * static Scheme_Object *