X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flisp%2Fao_lisp_lambda.c;h=0dd8c698646703ea5f0a0057de4d7b9faee937d6;hb=13a4d451b903d08e52005bcf531efa8de351bf2b;hp=cc5af4bce23bd860b55203ad27bf99d568c6a72d;hpb=417161dbb36323b5a6572859dedad02ca92fc65c;p=fw%2Faltos

diff --git a/src/lisp/ao_lisp_lambda.c b/src/lisp/ao_lisp_lambda.c
index cc5af4bc..0dd8c698 100644
--- a/src/lisp/ao_lisp_lambda.c
+++ b/src/lisp/ao_lisp_lambda.c
@@ -47,19 +47,9 @@ const struct ao_lisp_type ao_lisp_lambda_type = {
 	.size = lambda_size,
 	.mark = lambda_mark,
 	.move = lambda_move,
+	.name = "lambda",
 };
 
-static int
-ao_lisp_cons_length(struct ao_lisp_cons *cons)
-{
-	int	len = 0;
-	while (cons) {
-		len++;
-		cons = ao_lisp_poly_cons(cons->cdr);
-	}
-	return len;
-}
-
 void
 ao_lisp_lambda_print(ao_poly poly)
 {
@@ -79,7 +69,9 @@ ao_lisp_lambda_print(ao_poly poly)
 ao_poly
 ao_lisp_lambda_alloc(struct ao_lisp_cons *code, int args)
 {
+	ao_lisp_cons_stash(0, code);
 	struct ao_lisp_lambda	*lambda = ao_lisp_alloc(sizeof (struct ao_lisp_lambda));
+	code = ao_lisp_cons_fetch(0);
 	struct ao_lisp_cons	*arg;
 	int			f;
 
@@ -133,18 +125,17 @@ ao_lisp_macro(struct ao_lisp_cons *cons)
 }
 
 ao_poly
-ao_lisp_lambda_eval(struct ao_lisp_lambda *lambda,
-		    struct ao_lisp_cons *cons)
+ao_lisp_lambda_eval(void)
 {
-	struct ao_lisp_cons	*code;
-	struct ao_lisp_cons	*args;
+	struct ao_lisp_lambda	*lambda = ao_lisp_poly_lambda(ao_lisp_v);
+	struct ao_lisp_cons	*cons = ao_lisp_poly_cons(ao_lisp_stack->values);
+	struct ao_lisp_cons	*code = ao_lisp_poly_cons(lambda->code);
+	struct ao_lisp_cons	*args = ao_lisp_poly_cons(ao_lisp_arg(code, 0));
 	struct ao_lisp_frame	*next_frame;
 	int			args_wanted;
 	int			args_provided;
 
-	code = ao_lisp_poly_cons(lambda->code);
 	DBGI("lambda "); DBG_POLY(ao_lisp_lambda_poly(lambda)); DBG("\n");
-	args = ao_lisp_poly_cons(ao_lisp_arg(code, 0));
 
 	args_wanted = ao_lisp_cons_length(args);
 
@@ -156,7 +147,15 @@ ao_lisp_lambda_eval(struct ao_lisp_lambda *lambda,
 		args_provided = 1;
 	if (args_wanted != args_provided)
 		return ao_lisp_error(AO_LISP_INVALID, "need %d args, not %d", args_wanted, args_provided);
+
 	next_frame = ao_lisp_frame_new(args_wanted);
+
+	/* Re-fetch all of the values in case something moved */
+	lambda = ao_lisp_poly_lambda(ao_lisp_v);
+	cons = ao_lisp_poly_cons(ao_lisp_stack->values);
+	code = ao_lisp_poly_cons(lambda->code);
+	args = ao_lisp_poly_cons(ao_lisp_arg(code, 0));
+
 	switch (lambda->args) {
 	case AO_LISP_FUNC_LAMBDA: {
 		int			f;
@@ -169,6 +168,7 @@ ao_lisp_lambda_eval(struct ao_lisp_lambda *lambda,
 			args = ao_lisp_poly_cons(args->cdr);
 			vals = ao_lisp_poly_cons(vals->cdr);
 		}
+		ao_lisp_cons_free(cons);
 		break;
 	}
 	case AO_LISP_FUNC_LEXPR: