* value and re-evaluate it
*/
prev = ao_lisp_poly_stack(ao_lisp_stack->prev);
- ao_lisp_stack->state = eval_sexpr;
ao_lisp_stack->sexprs = prev->sexprs;
DBGI(".. start macro\n");
DBGI(".. frame "); DBG_POLY(ao_lisp_frame_poly(ao_lisp_frame_current)); DBG("\n");
break;
case AO_LISP_LAMBDA:
- ao_lisp_stack->state = eval_sexpr;
DBGI(".. frame "); DBG_POLY(ao_lisp_frame_poly(ao_lisp_frame_current)); DBG("\n");
- ao_lisp_v = ao_lisp_lambda_eval();
- DBGI(".. sexpr "); DBG_POLY(ao_lisp_v); DBG("\n");
+ ao_lisp_stack->state = eval_progn;
+ v = ao_lisp_lambda_eval();
+ ao_lisp_stack->sexprs = v;
+ DBGI(".. sexprs "); DBG_POLY(ao_lisp_stack->sexprs); DBG("\n");
DBGI(".. frame "); DBG_POLY(ao_lisp_frame_poly(ao_lisp_frame_current)); DBG("\n");
break;
}
ao_lisp_stack->state = eval_cond_test;
if (!ao_lisp_stack_push())
return 0;
- ao_lisp_stack->state = eval_sexpr;
}
return 1;
}
DBGI(".. saved frame "); DBG_POLY(ao_lisp_stack->frame); DBG("\n");
if (ao_lisp_v) {
struct ao_lisp_cons *car = ao_lisp_poly_cons(ao_lisp_poly_cons(ao_lisp_stack->sexprs)->car);
- struct ao_lisp_cons *c = ao_lisp_poly_cons(car->cdr);
+ ao_poly c = car->cdr;
if (c) {
- ao_lisp_stack->state = eval_sexpr;
- ao_lisp_v = c->car;
+ ao_lisp_stack->state = eval_progn;
+ ao_lisp_stack->sexprs = c;
} else
ao_lisp_stack->state = eval_val;
} else {
} else {
ao_lisp_v = ao_lisp_poly_cons(ao_lisp_stack->sexprs)->car;
ao_lisp_stack->sexprs = ao_lisp_poly_cons(ao_lisp_stack->sexprs)->cdr;
+
+ /* If there are more sexprs to do, then come back here, otherwise
+ * return the value of the last one by just landing in eval_sexpr
+ */
if (ao_lisp_stack->sexprs) {
ao_lisp_stack->state = eval_progn;
if (!ao_lisp_stack_push())
ao_lisp_stack->state = eval_while_test;
if (!ao_lisp_stack_push())
return 0;
- ao_lisp_stack->state = eval_sexpr;
}
return 1;
}
if (ao_lisp_v) {
ao_lisp_v = ao_lisp_poly_cons(ao_lisp_stack->sexprs)->cdr;
- if (ao_lisp_v)
- ao_lisp_v = ao_lisp_poly_cons(ao_lisp_v)->car;
ao_lisp_stack->state = eval_while;
if (!ao_lisp_stack_push())
return 0;
+ ao_lisp_stack->state = eval_progn;
+ ao_lisp_stack->sexprs = ao_lisp_v;
}
else
ao_lisp_stack->state = eval_val;
{
DBGI("macro: "); DBG_POLY(ao_lisp_v); DBG(" sexprs "); DBG_POLY(ao_lisp_stack->sexprs); DBG("\n");
+ if (ao_lisp_v == AO_LISP_NIL)
+ ao_lisp_abort();
if (ao_lisp_poly_type(ao_lisp_v) == AO_LISP_CONS) {
*ao_lisp_poly_cons(ao_lisp_stack->sexprs) = *ao_lisp_poly_cons(ao_lisp_v);
ao_lisp_v = ao_lisp_stack->sexprs;