1 files changed, 39 insertions, 4 deletions

diff --git a/src/bootstrap/primitives.c b/src/bootstrap/primitives.c
index 4ef56d5..4c3e4c6 100644
--- a/src/bootstrap/primitives.c
+++ b/src/bootstrap/primitives.c
@@ -54,7 +54,7 @@ eval_lambda:
             if (lambda->type == OBJ_TYPE_LAMBDA) {
                 Object *fun = lambda;
                 Object *args = root->cdr;
-                Object *params = fun->args;
+                Object *params = fun->params;
                 env = env_extend(fun->env, env);
                 while (params != obj_nil) {
                     if (args == obj_nil) {
@@ -742,8 +742,8 @@ proc_lambda(Environment *env, Object *obj) {
         });
         return obj_err;
     }
-    Object *args = obj->car;
-    if (args != obj_nil && args->type != OBJ_TYPE_PAIR) {
+    Object *params = obj->car;
+    if (params != obj_nil && params->type != OBJ_TYPE_PAIR) {
         error_push((Error){
             .type = ERR_TYPE_RUNTIME,
             .value = ERR_WRONG_ARG_TYPE,
@@ -752,12 +752,47 @@ proc_lambda(Environment *env, Object *obj) {
     }
     Object *body = obj->cdr;
     Object *fun = alloc_object(OBJ_TYPE_LAMBDA);
-    fun->args = obj_duplicate(args);
+    fun->params = obj_duplicate(params);
     fun->body = obj_duplicate(body);
     fun->env = env;
     return fun;
 }
 
+Object *
+proc_fun(Environment *env, Object *obj) {
+    if (obj == obj_nil || obj->cdr == obj_nil || obj->cdr->cdr == obj_nil) {
+        error_push((Error){
+            .type = ERR_TYPE_RUNTIME,
+            .value = ERR_NOT_ENOUGH_ARGS,
+        });
+        return obj_err;
+    }
+
+    Object *name = obj->car;
+    if (name->type != OBJ_TYPE_SYMBOL) {
+        error_push((Error){
+            .type = ERR_TYPE_RUNTIME,
+            .value = ERR_WRONG_ARG_TYPE,
+        });
+        return obj_err;
+    }
+
+    Object *params = obj->cdr->car;
+    if (params != obj_nil && params->type != OBJ_TYPE_PAIR) {
+        error_push((Error){
+            .type = ERR_TYPE_RUNTIME,
+            .value = ERR_WRONG_ARG_TYPE,
+        });
+        return obj_err;
+    }
+    Object *body = obj->cdr->cdr;
+    Object *fun = alloc_object(OBJ_TYPE_LAMBDA);
+    fun->params = obj_duplicate(params);
+    fun->body = obj_duplicate(body);
+    fun->env = env;
+    env_add_or_update_current(env, name, fun);
+    return obj_nil;
+}
 
 //
 // Evaluation.