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

fix incorrect propagation of name via syntax-local-name

Browse Source 
Merge to v6.0
This commit is contained in:
Matthew Flatt 2013-12-14 21:11:08 -07:00
parent 80d0b2fcc3
commit 4abe7d2657
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/racket-pkgs/racket-test/tests/racket/name.rktl
View File

@ -104,4 +104,8 @@
object-name object-name
(eval (read (open-input-string "(let () (define-struct CP (a)) make-CP)"))))) (eval (read (open-input-string "(let () (define-struct CP (a)) make-CP)")))))
(err/rt-test (let ([unmentionable ((lambda (x #:a a) 1) 1 2)]) 5)
(lambda (exn) (not (regexp-match? #rx"unmentionable" (exn-message exn)))))
(report-errs) (report-errs)

7
racket/src/racket/src/compile.c
View File

@ -4933,12 +4933,17 @@ compile_expand_app(Scheme_Object *orig_form, Scheme_Comp_Env *env,
/* naya will be prefixed and returned... */ /* naya will be prefixed and returned... */
} }
} else if (rec[drec].comp) { } else if (rec[drec].comp) {
Scheme_Object *name, *origname, *gval, *orig_rest_form, *rest_form; Scheme_Object *name, *origname, *gval, *orig_rest_form, *rest_form, *vname;
name = SCHEME_STX_CAR(form); name = SCHEME_STX_CAR(form);
origname = name; origname = name;
vname = rec[drec].value_name;
rec[drec].value_name = scheme_false;
name = scheme_check_immediate_macro(name, env, rec, drec, 0, &gval, NULL, NULL); name = scheme_check_immediate_macro(name, env, rec, drec, 0, &gval, NULL, NULL);
rec[drec].value_name = vname;
/* look for ((lambda (x ...) ....) ....) or ((lambda x ....) ....) */ /* look for ((lambda (x ...) ....) ....) or ((lambda x ....) ....) */
if (SAME_OBJ(gval, scheme_lambda_syntax)) { if (SAME_OBJ(gval, scheme_lambda_syntax)) {
Scheme_Object *argsnbody, *d_name; Scheme_Object *argsnbody, *d_name;