altos/lisp: Allow macro/nlambda/lexpr to have multiple args

[fw/altos] / src / lisp / ao_lisp_lambda.c

diff --git a/src/lisp/ao_lisp_lambda.c b/src/lisp/ao_lisp_lambda.c
index cc5af4bce23bd860b55203ad27bf99d568c6a72d..186236f6eb7e8f3e5373050dbac8a76b48684b61 100644 (file)
--- 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;
 
@@ -102,7 +94,7 @@ ao_lisp_lambda_alloc(struct ao_lisp_cons *code, int args)
        lambda->type = AO_LISP_LAMBDA;
        lambda->args = args;
        lambda->code = ao_lisp_cons_poly(code);
-       lambda->frame = ao_lisp_frame_poly(ao_lisp_frame_current);
+       lambda->frame = ao_lisp_frame_mark(ao_lisp_frame_current);
        DBGI("build frame: "); DBG_POLY(lambda->frame); DBG("\n");
        DBG_STACK();
        return ao_lisp_lambda_poly(lambda);
@@ -133,35 +125,44 @@ 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;
+       int                     f;
+       struct ao_lisp_cons     *vals
 
-       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);
 
        /* Create a frame to hold the variables
         */
-       if (lambda->args == AO_LISP_FUNC_LAMBDA)
-               args_provided = ao_lisp_cons_length(cons) - 1;
-       else
-               args_provided = 1;
-       if (args_wanted != args_provided)
-               return ao_lisp_error(AO_LISP_INVALID, "need %d args, not %d", args_wanted, args_provided);
+       args_provided = ao_lisp_cons_length(cons) - 1;
+       if (lambda->args == AO_LISP_FUNC_LAMBDA) {
+               if (args_wanted != args_provided)
+                       return ao_lisp_error(AO_LISP_INVALID, "need %d args, got %d", args_wanted, args_provided);
+       } else {
+               if (args_provided < args_wanted - 1)
+                       return ao_lisp_error(AO_LISP_INVALID, "need at least %d args, got %d", args_wanted, args_provided);
+       }
+
        next_frame = ao_lisp_frame_new(args_wanted);
-       switch (lambda->args) {
-       case AO_LISP_FUNC_LAMBDA: {
-               int                     f;
-               struct ao_lisp_cons     *vals = ao_lisp_poly_cons(cons->cdr);
 
+       /* 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));
+       vals = ao_lisp_poly_cons(cons->cdr);
+
+       switch (lambda->args) {
+       case AO_LISP_FUNC_LAMBDA:
                for (f = 0; f < args_wanted; f++) {
                        DBGI("bind "); DBG_POLY(args->car); DBG(" = "); DBG_POLY(vals->car); DBG("\n");
                        next_frame->vals[f].atom = args->car;
@@ -169,17 +170,24 @@ 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:
        case AO_LISP_FUNC_NLAMBDA:
        case AO_LISP_FUNC_MACRO:
-               DBGI("bind "); DBG_POLY(args->car); DBG(" = "); DBG_POLY(cons->cdr); DBG("\n");
-               next_frame->vals[0].atom = args->car;
-               next_frame->vals[0].val = cons->cdr;
+               for (f = 0; f < args_wanted - 1; f++) {
+                       DBGI("bind "); DBG_POLY(args->car); DBG(" = "); DBG_POLY(vals->car); DBG("\n");
+                       next_frame->vals[f].atom = args->car;
+                       next_frame->vals[f].val = vals->car;
+                       args = ao_lisp_poly_cons(args->cdr);
+                       vals = ao_lisp_poly_cons(vals->cdr);
+               }
+               DBGI("bind "); DBG_POLY(args->car); DBG(" = "); DBG_POLY(); DBG("\n");
+               next_frame->vals[f].atom = args->car;
+               next_frame->vals[f].val = ao_lisp_cons_poly(vals);
                break;
        }
-       next_frame->next = lambda->frame;
+       next_frame->prev = lambda->frame;
        DBGI("eval frame: "); DBG_POLY(ao_lisp_frame_poly(next_frame)); DBG("\n");
        ao_lisp_frame_current = next_frame;
        ao_lisp_stack->frame = ao_lisp_frame_poly(ao_lisp_frame_current);