When apply is invoked on any function, the cons in the argument list
cannot be immediately freed as they have been passed to the
function. That applies to both built-ins as well as lambdas; this
patch removes the special ao_scheme_skip_cons_free global and just
marks the stack in both cases.
Signed-off-by: Keith Packard <keithp@keithp.com>
struct ao_scheme_stack *ao_scheme_stack;
ao_poly ao_scheme_v;
struct ao_scheme_stack *ao_scheme_stack;
ao_poly ao_scheme_v;
-uint8_t ao_scheme_skip_cons_free;
ao_poly
ao_scheme_set_cond(struct ao_scheme_cons *c)
ao_poly
ao_scheme_set_cond(struct ao_scheme_cons *c)
DBGI("set "); DBG_POLY(atom); DBG(" = "); DBG_POLY(val); DBG("\n");
});
builtin = ao_scheme_poly_builtin(ao_scheme_v);
DBGI("set "); DBG_POLY(atom); DBG(" = "); DBG_POLY(val); DBG("\n");
});
builtin = ao_scheme_poly_builtin(ao_scheme_v);
- if (builtin && (builtin->args & AO_SCHEME_FUNC_FREE_ARGS) && !ao_scheme_stack_marked(ao_scheme_stack) && !ao_scheme_skip_cons_free) {
+ if (builtin && (builtin->args & AO_SCHEME_FUNC_FREE_ARGS) && !ao_scheme_stack_marked(ao_scheme_stack)) {
struct ao_scheme_cons *cons = ao_scheme_poly_cons(ao_scheme_stack->values);
ao_scheme_stack->values = AO_SCHEME_NIL;
ao_scheme_cons_free(cons);
struct ao_scheme_cons *cons = ao_scheme_poly_cons(ao_scheme_stack->values);
ao_scheme_stack->values = AO_SCHEME_NIL;
ao_scheme_cons_free(cons);
DBGI(".. frame "); DBG_POLY(ao_scheme_frame_poly(ao_scheme_frame_current)); DBG("\n");
break;
}
DBGI(".. frame "); DBG_POLY(ao_scheme_frame_poly(ao_scheme_frame_current)); DBG("\n");
break;
}
- ao_scheme_skip_cons_free = 0;
ao_scheme_v = ao_scheme_poly_cons(ao_scheme_stack->values)->car;
DBGI("apply: "); DBG_POLY(ao_scheme_stack->values); DBG ("\n");
ao_scheme_stack->state = eval_exec;
ao_scheme_v = ao_scheme_poly_cons(ao_scheme_stack->values)->car;
DBGI("apply: "); DBG_POLY(ao_scheme_stack->values); DBG ("\n");
ao_scheme_stack->state = eval_exec;
- ao_scheme_skip_cons_free = 1;
+ ao_scheme_stack_mark(ao_scheme_stack);
ao_scheme_stack->state = eval_val;
} else {
ao_scheme_v = ao_scheme_poly_cons(ao_scheme_stack->sexprs)->car;
ao_scheme_stack->state = eval_val;
} else {
ao_scheme_v = ao_scheme_poly_cons(ao_scheme_stack->sexprs)->car;
- if (!ao_scheme_v || ao_scheme_poly_type(ao_scheme_v) != AO_SCHEME_CONS) {
+ if (!ao_scheme_v || !AO_SCHEME_IS_CONS(ao_scheme_v)) {
ao_scheme_error(AO_SCHEME_INVALID, "invalid cond clause");
return 0;
}
ao_scheme_error(AO_SCHEME_INVALID, "invalid cond clause");
return 0;
}
if (ao_scheme_v == AO_SCHEME_NIL)
ao_scheme_abort();
if (ao_scheme_v == AO_SCHEME_NIL)
ao_scheme_abort();
- if (ao_scheme_poly_type(ao_scheme_v) == AO_SCHEME_CONS) {
+ if (AO_SCHEME_IS_CONS(ao_scheme_v)) {
*ao_scheme_poly_cons(ao_scheme_stack->sexprs) = *ao_scheme_poly_cons(ao_scheme_v);
ao_scheme_v = ao_scheme_stack->sexprs;
DBGI("sexprs rewritten to: "); DBG_POLY(ao_scheme_v); DBG("\n");
*ao_scheme_poly_cons(ao_scheme_stack->sexprs) = *ao_scheme_poly_cons(ao_scheme_v);
ao_scheme_v = ao_scheme_stack->sexprs;
DBGI("sexprs rewritten to: "); DBG_POLY(ao_scheme_v); DBG("\n");