X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flisp%2Fao_lisp_eval.c;h=04d0e70a2f79eeeee957ee01df3ced52575478db;hb=ce549b2c11e6b2571590021e1c0503d8a6e7a702;hp=f3372f2a4e52ee73c39985ec9cd3584268694d4c;hpb=0ee44c8e4bf5dabe6a97bf76b366c8b767c387f8;p=fw%2Faltos

diff --git a/src/lisp/ao_lisp_eval.c b/src/lisp/ao_lisp_eval.c
index f3372f2a..04d0e70a 100644
--- a/src/lisp/ao_lisp_eval.c
+++ b/src/lisp/ao_lisp_eval.c
@@ -16,6 +16,8 @@
 #include "ao_lisp.h"
 #include <assert.h>
 
+const struct ao_lisp_type ao_lisp_stack_type;
+
 static int
 stack_size(void *addr)
 {
@@ -32,40 +34,43 @@ stack_mark(void *addr)
 		ao_lisp_poly_mark(stack->values, 0);
 		/* no need to mark values_tail */
 		ao_lisp_poly_mark(stack->frame, 0);
+		ao_lisp_poly_mark(stack->list, 0);
 		stack = ao_lisp_poly_stack(stack->prev);
-		if (ao_lisp_mark_memory(stack, sizeof (struct ao_lisp_stack)))
+		if (ao_lisp_mark_memory(&ao_lisp_stack_type, stack))
 			break;
 	}
 }
 
-static const struct ao_lisp_type ao_lisp_stack_type;
-
 static void
 stack_move(void *addr)
 {
 	struct ao_lisp_stack	*stack = addr;
 
 	while (stack) {
-		void	*prev;
-		int	ret;
+		struct ao_lisp_stack	*prev;
+		int			ret;
 		(void) ao_lisp_poly_move(&stack->sexprs, 0);
 		(void) ao_lisp_poly_move(&stack->values, 0);
 		(void) ao_lisp_poly_move(&stack->values_tail, 0);
 		(void) ao_lisp_poly_move(&stack->frame, 0);
+		(void) ao_lisp_poly_move(&stack->list, 0);
 		prev = ao_lisp_poly_stack(stack->prev);
-		ret = ao_lisp_move(&ao_lisp_stack_type, &prev);
+		if (!prev)
+			break;
+		ret = ao_lisp_move_memory(&ao_lisp_stack_type, (void **) &prev);
 		if (prev != ao_lisp_poly_stack(stack->prev))
 			stack->prev = ao_lisp_stack_poly(prev);
 		if (ret)
 			break;
-		stack = ao_lisp_poly_stack(stack->prev);
+		stack = prev;
 	}
 }
 
-static const struct ao_lisp_type ao_lisp_stack_type = {
+const struct ao_lisp_type ao_lisp_stack_type = {
 	.size = stack_size,
 	.mark = stack_mark,
-	.move = stack_move
+	.move = stack_move,
+	.name = "stack"
 };
 
 struct ao_lisp_stack		*ao_lisp_stack;
@@ -101,8 +106,8 @@ ao_lisp_stack_push(void)
 	ao_lisp_stack = stack;
 	ao_lisp_stack_reset(stack);
 	DBGI("stack push\n");
-	DBG_IN();
 	DBG_FRAMES();
+	DBG_IN();
 	return 1;
 }
 
@@ -236,37 +241,11 @@ static int
 ao_lisp_eval_val(void)
 {
 	DBGI("val: "); DBG_POLY(ao_lisp_v); DBG("\n");
-#if 0
-	if (ao_lisp_stack->macro) {
-		DBGI(".. end macro %d\n", ao_lisp_stack->macro);
-		DBGI(".. sexprs       "); DBG_POLY(ao_lisp_stack->sexprs); DBG("\n");
-		DBGI(".. values       "); DBG_POLY(ao_lisp_stack->values); DBG("\n");
-		ao_lisp_frames_dump();
-
-		ao_lisp_stack_pop();
-#if 0
-		/*
-		 * Re-use the current stack to evaluate
-		 * the value from the macro
-		 */
-		ao_lisp_stack->state = eval_sexpr;
-		ao_lisp_frame_current = ao_lisp_poly_frame(ao_lisp_stack->macro_frame);
-		ao_lisp_stack->frame = ao_lisp_stack->macro_frame;
-		ao_lisp_stack->macro = 0;
-		ao_lisp_stack->macro_frame = AO_LISP_NIL;
-		ao_lisp_stack->sexprs = AO_LISP_NIL;
-		ao_lisp_stack->values = AO_LISP_NIL;
-		ao_lisp_stack->values_tail = AO_LISP_NIL;
-#endif
-	} else
-#endif
-	{
-		/*
-		 * Value computed, pop the stack
-		 * to figure out what to do with the value
-		 */
-		ao_lisp_stack_pop();
-	}
+	/*
+	 * Value computed, pop the stack
+	 * to figure out what to do with the value
+	 */
+	ao_lisp_stack_pop();
 	DBGI("..state %d\n", ao_lisp_stack ? ao_lisp_stack->state : -1);
 	return 1;
 }
@@ -305,7 +284,6 @@ ao_lisp_eval_formal(void)
 			break;
 		case AO_LISP_FUNC_MACRO:
 			/* Evaluate the result once more */
-			prev = ao_lisp_stack;
 			ao_lisp_stack->state = eval_sexpr;
 			if (!ao_lisp_stack_push())
 				return 0;
@@ -313,6 +291,7 @@ ao_lisp_eval_formal(void)
 			/* After the function returns, take that
 			 * 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;
 			prev->sexprs = AO_LISP_NIL;
@@ -400,8 +379,7 @@ ao_lisp_eval_exec(void)
 	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(ao_lisp_poly_lambda(ao_lisp_v),
-						ao_lisp_poly_cons(ao_lisp_stack->values));
+		ao_lisp_v = ao_lisp_lambda_eval();
 		DBGI(".. sexpr "); DBG_POLY(ao_lisp_v); DBG("\n");
 		DBGI(".. frame "); DBG_POLY(ao_lisp_frame_poly(ao_lisp_frame_current)); DBG("\n");
 		break;
@@ -464,12 +442,11 @@ ao_lisp_eval_cond_test(void)
 		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_lisp_stack->state = eval_val;
 		if (c) {
+			ao_lisp_stack->state = eval_sexpr;
 			ao_lisp_v = c->car;
-			if (!ao_lisp_stack_push())
-				return 0;
-		}
+		} else
+			ao_lisp_stack->state = eval_val;
 	} else {
 		ao_lisp_stack->sexprs = ao_lisp_poly_cons(ao_lisp_stack->sexprs)->cdr;
 		DBGI("next cond: "); DBG_POLY(ao_lisp_stack->sexprs); DBG("\n");
@@ -478,6 +455,85 @@ ao_lisp_eval_cond_test(void)
 	return 1;
 }
 
+/*
+ * Evaluate a list of sexprs, returning the value from the last one.
+ *
+ * ao_lisp_progn records the list in stack->sexprs, so we just need to
+ * walk that list. Set ao_lisp_v to the car of the list and jump to
+ * eval_sexpr. When that's done, it will land in eval_val. For all but
+ * the last, leave a stack frame with eval_progn set so that we come
+ * back here. For the last, don't add a stack frame so that we can
+ * just continue on.
+ */
+static int
+ao_lisp_eval_progn(void)
+{
+	DBGI("progn: "); DBG_POLY(ao_lisp_v); DBG(" sexprs "); DBG_POLY(ao_lisp_stack->sexprs); DBG("\n");
+	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_stack->state = eval_val;
+	} 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 (ao_lisp_stack->sexprs) {
+			ao_lisp_stack->state = eval_progn;
+			if (!ao_lisp_stack_push())
+				return 0;
+		}
+		ao_lisp_stack->state = eval_sexpr;
+	}
+	return 1;
+}
+
+/*
+ * Conditionally execute a list of sexprs while the first is true
+ */
+static int
+ao_lisp_eval_while(void)
+{
+	DBGI("while: "); DBG_POLY(ao_lisp_stack->sexprs); DBG("\n");
+	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_stack->state = eval_val;
+	} else {
+		ao_lisp_v = ao_lisp_poly_cons(ao_lisp_stack->sexprs)->car;
+		ao_lisp_stack->state = eval_while_test;
+		if (!ao_lisp_stack_push())
+			return 0;
+		ao_lisp_stack->state = eval_sexpr;
+	}
+	return 1;
+}
+
+/*
+ * Check the while condition, terminate the loop if nil. Otherwise keep going
+ */
+static int
+ao_lisp_eval_while_test(void)
+{
+	DBGI("while_test: "); DBG_POLY(ao_lisp_v); DBG(" sexprs "); DBG_POLY(ao_lisp_stack->sexprs); DBG("\n");
+	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_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;
+	}
+	else
+		ao_lisp_stack->state = eval_val;
+	return 1;
+}
+
 static int (*const evals[])(void) = {
 	[eval_sexpr] = ao_lisp_eval_sexpr,
 	[eval_val] = ao_lisp_eval_val,
@@ -485,19 +541,33 @@ static int (*const evals[])(void) = {
 	[eval_exec] = ao_lisp_eval_exec,
 	[eval_cond] = ao_lisp_eval_cond,
 	[eval_cond_test] = ao_lisp_eval_cond_test,
+	[eval_progn] = ao_lisp_eval_progn,
+	[eval_while] = ao_lisp_eval_while,
+	[eval_while_test] = ao_lisp_eval_while_test,
 };
 
+/*
+ * Called at restore time to reset all execution state
+ */
+
+void
+ao_lisp_eval_clear_globals(void)
+{
+	ao_lisp_stack = NULL;
+	ao_lisp_frame_current = NULL;
+	ao_lisp_v = AO_LISP_NIL;
+}
+
+int
+ao_lisp_eval_restart(void)
+{
+	return ao_lisp_stack_push();
+}
+
 ao_poly
 ao_lisp_eval(ao_poly _v)
 {
-	static uint8_t been_here;
-
 	ao_lisp_v = _v;
-	if (!been_here) {
-		been_here = 1;
-		ao_lisp_root_add(&ao_lisp_stack_type, &ao_lisp_stack);
-		ao_lisp_root_poly_add(&ao_lisp_v);
-	}
 
 	if (!ao_lisp_stack_push())
 		return AO_LISP_NIL;