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)
}
/* Append formal to list of values */
- formal = ao_scheme__cons(ao_scheme_v, AO_SCHEME_NIL);
+ formal = ao_scheme_cons(ao_scheme_v, AO_SCHEME_NIL);
if (!formal)
return 0;
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);
}
ao_scheme_v = v;
- ao_scheme_stack->values = AO_SCHEME_NIL;
- ao_scheme_stack->values_tail = AO_SCHEME_NIL;
+ if (ao_scheme_stack->state != eval_exec) {
+ ao_scheme_stack->values = AO_SCHEME_NIL;
+ ao_scheme_stack->values_tail = AO_SCHEME_NIL;
+ }
DBGI(".. result "); DBG_POLY(ao_scheme_v); DBG ("\n");
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;
return 1;
}
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);
return 1;
}
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_is_pair(ao_scheme_v)) {
ao_scheme_error(AO_SCHEME_INVALID, "invalid cond clause");
return 0;
}
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");
[eval_macro] = "macro",
};
+#ifdef AO_SCHEME_FEATURE_SAVE
/*
* Called at restore time to reset all execution state
*/
{
return ao_scheme_stack_push();
}
+#endif /* AO_SCHEME_FEATURE_SAVE */
ao_poly
ao_scheme_eval(ao_poly _v)
return AO_SCHEME_NIL;
while (ao_scheme_stack) {
- if (!(*evals[ao_scheme_stack->state])() || ao_scheme_exception) {
- ao_scheme_stack_clear();
- return AO_SCHEME_NIL;
- }
+ if (!(*evals[ao_scheme_stack->state])() || ao_scheme_exception)
+ break;
}
DBG_DO(if (ao_scheme_frame_current) {DBGI("frame left as "); DBG_POLY(ao_scheme_frame_poly(ao_scheme_frame_current)); DBG("\n");});
+ ao_scheme_stack = NULL;
ao_scheme_frame_current = NULL;
return ao_scheme_v;
}