Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-07-07 13:16:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

adding lambda names in more cases

Browse source
This commit is contained in:
Alex Shinn 2010-07-19 23:39:23 +09:00
parent d43cf9f6c2
commit b165a27fcf
1 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
eval.c
View file

@ -440,6 +440,7 @@ static sexp sexp_identifier_eq_op (sexp ctx sexp_api_params(self, n), sexp e1, s
/************************* the compiler ***************************/ /************************* the compiler ***************************/
static sexp analyze_app (sexp ctx, sexp x) { static sexp analyze_app (sexp ctx, sexp x) {
sexp p;
sexp_gc_var2(res, tmp); sexp_gc_var2(res, tmp);
sexp_gc_preserve2(ctx, res, tmp); sexp_gc_preserve2(ctx, res, tmp);
for (res=SEXP_NULL; sexp_pairp(x); x=sexp_cdr(x)) { for (res=SEXP_NULL; sexp_pairp(x); x=sexp_cdr(x)) {
@ -452,8 +453,22 @@ static sexp analyze_app (sexp ctx, sexp x) {
sexp_car(res) = tmp; sexp_car(res) = tmp;
} }
} }
if (sexp_pairp(res)) { /* fill in lambda names */
res = sexp_nreverse(ctx, res);
if (sexp_lambdap(sexp_car(res))) {
p=sexp_lambda_params(sexp_car(res));
for (tmp=sexp_cdr(res);
sexp_pairp(tmp) && sexp_pairp(p);
tmp=sexp_cdr(tmp), p=sexp_cdr(p)) {
if (sexp_lambdap(sexp_car(tmp))) {
sexp_debug(ctx, "setting lambda name: ", sexp_car(p));
sexp_lambda_name(sexp_car(tmp)) = sexp_car(p);
}
}
}
}
sexp_gc_release2(ctx); sexp_gc_release2(ctx);
return (sexp_pairp(res) ? sexp_nreverse(ctx, res) : res); return res;
} }
static sexp analyze_seq (sexp ctx, sexp ls) { static sexp analyze_seq (sexp ctx, sexp ls) {
@ -560,6 +575,7 @@ static sexp analyze_lambda (sexp ctx, sexp x) {
value = analyze(ctx3, sexp_cadar(tmp)); value = analyze(ctx3, sexp_cadar(tmp));
} }
if (sexp_exceptionp(value)) sexp_return(res, value); if (sexp_exceptionp(value)) sexp_return(res, value);
if (sexp_lambdap(value)) sexp_lambda_name(value) = name;
sexp_push(ctx3, defs, sexp_push(ctx3, defs,
sexp_make_set(ctx3, analyze_var_ref(ctx3, name, NULL), value)); sexp_make_set(ctx3, analyze_var_ref(ctx3, name, NULL), value));
} }
@ -626,14 +642,16 @@ static sexp analyze_define (sexp ctx, sexp x) {
} else } else
value = analyze(ctx, sexp_caddr(x)); value = analyze(ctx, sexp_caddr(x));
ref = analyze_var_ref(ctx, name, &varenv); ref = analyze_var_ref(ctx, name, &varenv);
if (sexp_exceptionp(ref)) if (sexp_exceptionp(ref)) {
res = ref; res = ref;
else if (sexp_exceptionp(value)) } else if (sexp_exceptionp(value)) {
res = value; res = value;
else if (varenv && sexp_immutablep(varenv)) } else if (varenv && sexp_immutablep(varenv)) {
res = sexp_compile_error(ctx, "immutable binding", name); res = sexp_compile_error(ctx, "immutable binding", name);
else } else {
if (sexp_lambdap(value)) sexp_lambda_name(value) = name;
res = sexp_make_set(ctx, ref, value); res = sexp_make_set(ctx, ref, value);
}
} }
} }
sexp_gc_release4(ctx); sexp_gc_release4(ctx);