X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flisp%2Fao_lisp_eval.c;h=ced182f6aeddfeb9a2b617f0f4b05293c4fc2d04;hb=ed6967cef5d82baacafe1c23229f44d58c838326;hp=1044aa48a6a3eff6122769dbdb95ea8c138cafcf;hpb=00bf2ca86b60e6501880011897cea073865c5a03;p=fw%2Faltos

diff --git a/src/lisp/ao_lisp_eval.c b/src/lisp/ao_lisp_eval.c
index 1044aa48..ced182f6 100644
--- a/src/lisp/ao_lisp_eval.c
+++ b/src/lisp/ao_lisp_eval.c
@@ -68,7 +68,7 @@ func_type(ao_poly func)
 static int
 ao_lisp_eval_sexpr(void)
 {
-	DBGI("sexpr: "); DBG_POLY(ao_lisp_v); DBG("\n");
+	DBGI("sexpr: %v\n", ao_lisp_v);
 	switch (ao_lisp_poly_type(ao_lisp_v)) {
 	case AO_LISP_CONS:
 		if (ao_lisp_v == AO_LISP_NIL) {
@@ -193,8 +193,8 @@ ao_lisp_eval_formal(void)
 			ao_lisp_stack->sexprs = prev->sexprs;
 
 			DBGI(".. start macro\n");
-			DBGI(".. sexprs       "); DBG_POLY(ao_lisp_stack->sexprs); DBG("\n");
-			DBGI(".. values       "); DBG_POLY(ao_lisp_stack->values); DBG("\n");
+			DBGI("\t.. sexprs       "); DBG_POLY(ao_lisp_stack->sexprs); DBG("\n");
+			DBGI("\t.. values       "); DBG_POLY(ao_lisp_stack->values); DBG("\n");
 			DBG_FRAMES();
 
 			/* fall through ... */
@@ -350,7 +350,7 @@ ao_lisp_eval_cond(void)
 	DBGI(".. frame "); DBG_POLY(ao_lisp_frame_poly(ao_lisp_frame_current)); DBG("\n");
 	DBGI(".. saved frame "); DBG_POLY(ao_lisp_stack->frame); DBG("\n");
 	if (!ao_lisp_stack->sexprs) {
-		ao_lisp_v = AO_LISP_NIL;
+		ao_lisp_v = _ao_lisp_bool_false;
 		ao_lisp_stack->state = eval_val;
 	} else {
 		ao_lisp_v = ao_lisp_poly_cons(ao_lisp_stack->sexprs)->car;
@@ -559,6 +559,8 @@ ao_lisp_eval(ao_poly _v)
 {
 	ao_lisp_v = _v;
 
+	ao_lisp_frame_init();
+
 	if (!ao_lisp_stack_push())
 		return AO_LISP_NIL;