local expand: only 1 failure: 60-let-syntax.

This commit is contained in:
Jan Nieuwenhuizen 2018-10-16 18:16:12 +02:00
parent e915bcf3a2
commit 9e00b76011
No known key found for this signature in database
GPG Key ID: F3C1A0D9C1D65273
1 changed files with 5 additions and 9 deletions

View File

@ -874,12 +874,8 @@ call_lambda (SCM e, SCM formals, SCM a) ///((internal))
{ {
SCM cl = cons (cons (cell_closure, a), a); SCM cl = cons (cons (cell_closure, a), a);
r1 = e; r1 = e;
// expand_variable (e, formals, 0);
r0 = cl; r0 = cl;
expand_variable (e, cell_nil, 0); expand_variable (e, formals, 0);
// expand_variable (e, cell_nil, 0);
// no effect, but 2x slower on mescc compiling main.c
// expand_variable (e, cell_nil, 1);
r0 = cl; r0 = cl;
return cell_unspecified; return cell_unspecified;
} }
@ -1059,11 +1055,11 @@ expand_variable_ (SCM x, SCM formals, int global_p, int top_p) ///((internal))
if (v == cell_f && g_debug > 2) if (v == cell_f && g_debug > 2)
{ {
eputs ("local_p: "); display_error_ (CAR (x)); eputs ("\n"); eputs ("local_p: "); display_error_ (CAR (x)); eputs ("\n");
//exit (22); exit (22);
} }
///if (v == cell_f || formal_p (n, formals)) //if (v == cell_f || formal_p (n, formals))
if (v == cell_f) // || formal_p (n, formals)) //if (v == cell_f)
v = n; //v = n;
CAR (x) = v; CAR (x) = v;
} }
else if (TYPE (CAR (x)) == TVARIABLE) else if (TYPE (CAR (x)) == TVARIABLE)