Argument checking should happen before evaluation

1 files changed, 7 insertions, 9 deletions

diff --git a/src/bootstrap/primitives.c b/src/bootstrap/primitives.c
index 9960688..64dea95 100644
--- a/src/bootstrap/primitives.c
+++ b/src/bootstrap/primitives.c
@@ -118,20 +118,18 @@ eval_lambda:
                     });
                     return obj_err;
                 }
+                if (args->car == obj_nil) {
+                    error_push((Error){
+                        .type = ERR_TYPE_RUNTIME,
+                        .value = ERR_NOT_ENOUGH_ARGS,
+                    });
+                    return obj_err;
+                }
                 Object *symbol = params->car;
                 Object *value = eval(env, args->car);
                 if (value == obj_err) {
                     return obj_err;
                 }
-                if (value == obj_nil) {
-                    // Need to reconsider this, it can cause issues when
-                    // arguments contain a random nil
-                    // error_push((Error){
-                    //     .type = ERR_TYPE_RUNTIME,
-                    //     .value = ERR_NOT_ENOUGH_ARGS,
-                    // });
-                    // return obj_err;
-                }
                 env_add_or_update_current(tmp, symbol, value);
                 args = args->cdr;
                 params = params->cdr;