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

Differentiating between analyze_app and the new analyze_list.

Browse source 
The latter is just for any list of ASTs to analyze, whereas the former
checks for lambda applications and fills in names.  Fixes equality
comparisons for procedures, so (equal? (lambda (x) x) (lambda (y) y))
now returns true.
This commit is contained in:
Alex Shinn 2013-06-08 23:37:12 +09:00
parent 5f628c8e72
commit d6b6ce955b
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
eval.c
View file

@ -599,8 +599,7 @@ sexp sexp_identifier_eq_op (sexp ctx, sexp self, sexp_sint_t n, sexp e1, sexp id
/************************* the compiler ***************************/ /************************* the compiler ***************************/
static sexp analyze_app (sexp ctx, sexp x) { static sexp analyze_list (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)) {
@ -614,16 +613,20 @@ static sexp analyze_app (sexp ctx, sexp x) {
sexp_car(res) = tmp; sexp_car(res) = tmp;
} }
} }
if (sexp_pairp(res)) { /* fill in lambda names */ if (sexp_pairp(res)) res = sexp_nreverse(ctx, res);
res = sexp_nreverse(ctx, res); sexp_gc_release2(ctx);
if (sexp_lambdap(sexp_car(res))) { return res;
}
static sexp analyze_app (sexp ctx, sexp x) {
sexp p, res, tmp;
res = analyze_list(ctx, x);
if (sexp_lambdap(sexp_car(res))) { /* fill in lambda names */
p=sexp_lambda_params(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)) 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))) if (sexp_lambdap(sexp_car(tmp)))
sexp_lambda_name(sexp_car(tmp)) = sexp_car(p); sexp_lambda_name(sexp_car(tmp)) = sexp_car(p);
} }
}
sexp_gc_release2(ctx);
return res; return res;
} }
@ -637,7 +640,7 @@ static sexp analyze_seq (sexp ctx, sexp ls) {
else { else {
res = sexp_alloc_type(ctx, seq, SEXP_SEQ); res = sexp_alloc_type(ctx, seq, SEXP_SEQ);
sexp_seq_source(res) = sexp_pair_source(ls); sexp_seq_source(res) = sexp_pair_source(ls);
tmp = analyze_app(ctx, ls); tmp = analyze_list(ctx, ls);
if (sexp_exceptionp(tmp)) if (sexp_exceptionp(tmp))
res = tmp; res = tmp;
else else
@ -988,7 +991,7 @@ static sexp analyze (sexp ctx, sexp object) {
sexp_warn(ctx, "too many args for opcode: ", x); sexp_warn(ctx, "too many args for opcode: ", x);
op = analyze_var_ref(ctx, sexp_car(x), NULL); op = analyze_var_ref(ctx, sexp_car(x), NULL);
} }
res = analyze_app(ctx, sexp_cdr(x)); res = analyze_list(ctx, sexp_cdr(x));
if (! sexp_exceptionp(res)) { if (! sexp_exceptionp(res)) {
/* push op, which will be a direct opcode if the call is valid */ /* push op, which will be a direct opcode if the call is valid */
sexp_push(ctx, res, op); sexp_push(ctx, res, op);