This commit is contained in:
Jan Nieuwenhuizen 2019-10-26 09:01:57 +02:00
parent 618da7a661
commit 7cbfca3db2
No known key found for this signature in database
GPG Key ID: F3C1A0D9C1D65273
1 changed files with 3 additions and 2 deletions

View File

@ -255,7 +255,7 @@ expand_variable_ (SCM x, SCM formals, int top_p) /*:((internal)) */
else if (CAR (x) == cell_symbol_define || CAR (x) == cell_symbol_define_macro)
{
SCM f = CADR (x);
if (top_p && TYPE (f) == TPAIR)
if (top_p != 0 && TYPE (f) == TPAIR)
f = CDR (f);
formals = add_formals (formals, f);
x = CDR (x);
@ -265,7 +265,8 @@ expand_variable_ (SCM x, SCM formals, int top_p) /*:((internal)) */
else if (TYPE (CAR (x)) == TSYMBOL
&& CAR (x) != cell_symbol_boot_module
&& CAR (x) != cell_symbol_current_module
&& CAR (x) != cell_symbol_primitive_load && !formal_p (CAR (x), formals))
&& CAR (x) != cell_symbol_primitive_load
&& formal_p (CAR (x), formals) == 0)
{
SCM v = module_variable (R0, CAR (x));
if (v != cell_f)