X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flisp%2Fao_lisp_eval.c;h=5fa9e0ad47a25ebbde49557b315ae41fd4e6ff1b;hb=eaa528e4e62ba1d9765888760d387303487b2e01;hp=ae2436b8cd86d7026bde5b1bc7347abaced9ba00;hpb=7da6bfc195fad97e3afc576c609897c131fd4d8c;p=fw%2Faltos

diff --git a/src/lisp/ao_lisp_eval.c b/src/lisp/ao_lisp_eval.c
index ae2436b8..5fa9e0ad 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,14 +34,13 @@ 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)
 {
@@ -47,14 +48,16 @@ stack_move(void *addr)
 
 	while (stack) {
 		struct ao_lisp_stack	*prev;
-		int	ret;
+		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_memory((void **) &prev,
-					  sizeof (struct ao_lisp_stack));
+		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)
@@ -63,15 +66,18 @@ stack_move(void *addr)
 	}
 }
 
-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;
 ao_poly				ao_lisp_v;
 
+struct ao_lisp_stack		*ao_lisp_stack_free_list;
+
 ao_poly
 ao_lisp_set_cond(struct ao_lisp_cons *c)
 {
@@ -93,9 +99,15 @@ ao_lisp_stack_reset(struct ao_lisp_stack *stack)
 static int
 ao_lisp_stack_push(void)
 {
-	struct ao_lisp_stack	*stack = ao_lisp_alloc(sizeof (struct ao_lisp_stack));
-	if (!stack)
-		return 0;
+	struct ao_lisp_stack	*stack;
+	if (ao_lisp_stack_free_list) {
+		stack = ao_lisp_stack_free_list;
+		ao_lisp_stack_free_list = ao_lisp_poly_stack(stack->prev);
+	} else {
+		stack = ao_lisp_alloc(sizeof (struct ao_lisp_stack));
+		if (!stack)
+			return 0;
+	}
 	stack->prev = ao_lisp_stack_poly(ao_lisp_stack);
 	stack->frame = ao_lisp_frame_poly(ao_lisp_frame_current);
 	stack->list = AO_LISP_NIL;
@@ -110,13 +122,23 @@ ao_lisp_stack_push(void)
 static void
 ao_lisp_stack_pop(void)
 {
+	ao_poly			prev;
+	struct ao_lisp_frame	*prev_frame;
+
 	if (!ao_lisp_stack)
 		return;
-	ao_lisp_stack = ao_lisp_poly_stack(ao_lisp_stack->prev);
+	prev = ao_lisp_stack->prev;
+	ao_lisp_stack->prev = ao_lisp_stack_poly(ao_lisp_stack_free_list);
+	ao_lisp_stack_free_list = ao_lisp_stack;
+
+	ao_lisp_stack = ao_lisp_poly_stack(prev);
+	prev_frame = ao_lisp_frame_current;
 	if (ao_lisp_stack)
 		ao_lisp_frame_current = ao_lisp_poly_frame(ao_lisp_stack->frame);
 	else
 		ao_lisp_frame_current = NULL;
+	if (ao_lisp_frame_current != prev_frame)
+		ao_lisp_frame_free(prev_frame);
 	DBG_OUT();
 	DBGI("stack pop\n");
 	DBG_FRAMES();
@@ -137,7 +159,7 @@ func_type(ao_poly func)
 		return ao_lisp_error(AO_LISP_INVALID, "func is nil");
 	switch (ao_lisp_poly_type(func)) {
 	case AO_LISP_BUILTIN:
-		return ao_lisp_poly_builtin(func)->args;
+		return ao_lisp_poly_builtin(func)->args & AO_LISP_FUNC_MASK;
 	case AO_LISP_LAMBDA:
 		return ao_lisp_poly_lambda(func)->args;
 	default:
@@ -280,7 +302,7 @@ ao_lisp_eval_formal(void)
 			break;
 		case AO_LISP_FUNC_MACRO:
 			/* Evaluate the result once more */
-			ao_lisp_stack->state = eval_sexpr;
+			ao_lisp_stack->state = eval_macro;
 			if (!ao_lisp_stack_push())
 				return 0;
 
@@ -288,9 +310,7 @@ ao_lisp_eval_formal(void)
 			 * 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;
 
 			DBGI(".. start macro\n");
 			DBGI(".. sexprs       "); DBG_POLY(ao_lisp_stack->sexprs); DBG("\n");
@@ -355,12 +375,15 @@ static int
 ao_lisp_eval_exec(void)
 {
 	ao_poly v;
+	struct ao_lisp_builtin	*builtin;
+
 	DBGI("exec: "); DBG_POLY(ao_lisp_v); DBG(" values "); DBG_POLY(ao_lisp_stack->values); DBG ("\n");
 	ao_lisp_stack->sexprs = AO_LISP_NIL;
 	switch (ao_lisp_poly_type(ao_lisp_v)) {
 	case AO_LISP_BUILTIN:
 		ao_lisp_stack->state = eval_val;
-		v = ao_lisp_func(ao_lisp_poly_builtin(ao_lisp_v)) (
+		builtin = ao_lisp_poly_builtin(ao_lisp_v);
+		v = ao_lisp_func(builtin) (
 			ao_lisp_poly_cons(ao_lisp_poly_cons(ao_lisp_stack->values)->cdr));
 		DBG_DO(if (!ao_lisp_exception && ao_lisp_poly_builtin(ao_lisp_v)->func == builtin_set) {
 				struct ao_lisp_cons *cons = ao_lisp_poly_cons(ao_lisp_stack->values);
@@ -368,15 +391,20 @@ ao_lisp_eval_exec(void)
 				ao_poly val = ao_lisp_arg(cons, 2);
 				DBGI("set "); DBG_POLY(atom); DBG(" = "); DBG_POLY(val); DBG("\n");
 			});
+		builtin = ao_lisp_poly_builtin(ao_lisp_v);
+		if (builtin->args & AO_LISP_FUNC_FREE_ARGS)
+			ao_lisp_cons_free(ao_lisp_poly_cons(ao_lisp_stack->values));
+
 		ao_lisp_v = v;
 		DBGI(".. result "); DBG_POLY(ao_lisp_v); DBG ("\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;
 	}
@@ -414,7 +442,6 @@ ao_lisp_eval_cond(void)
 		ao_lisp_stack->state = eval_cond_test;
 		if (!ao_lisp_stack_push())
 			return 0;
-		ao_lisp_stack->state = eval_sexpr;
 	}
 	return 1;
 }
@@ -436,11 +463,11 @@ ao_lisp_eval_cond_test(void)
 	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 {
@@ -474,6 +501,10 @@ ao_lisp_eval_progn(void)
 	} 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())
@@ -502,7 +533,6 @@ ao_lisp_eval_while(void)
 		ao_lisp_stack->state = eval_while_test;
 		if (!ao_lisp_stack_push())
 			return 0;
-		ao_lisp_stack->state = eval_sexpr;
 	}
 	return 1;
 }
@@ -519,17 +549,38 @@ ao_lisp_eval_while_test(void)
 
 	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;
 	return 1;
 }
 
+/*
+ * Replace the original sexpr with the macro expansion, then
+ * execute that
+ */
+static int
+ao_lisp_eval_macro(void)
+{
+	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;
+		DBGI("sexprs rewritten to: "); DBG_POLY(ao_lisp_v); DBG("\n");
+	}
+	ao_lisp_stack->sexprs = AO_LISP_NIL;
+	ao_lisp_stack->state = eval_sexpr;
+	return 1;
+}
+
 static int (*const evals[])(void) = {
 	[eval_sexpr] = ao_lisp_eval_sexpr,
 	[eval_val] = ao_lisp_eval_val,
@@ -540,19 +591,31 @@ static int (*const evals[])(void) = {
 	[eval_progn] = ao_lisp_eval_progn,
 	[eval_while] = ao_lisp_eval_while,
 	[eval_while_test] = ao_lisp_eval_while_test,
+	[eval_macro] = ao_lisp_eval_macro,
 };
 
+/*
+ * 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;