1 files changed, 64 insertions, 4 deletions

diff --git a/src/bootstrap/primitives.c b/src/bootstrap/primitives.c
index af8e9da..a3b69f6 100644
--- a/src/bootstrap/primitives.c
+++ b/src/bootstrap/primitives.c
@@ -630,15 +630,75 @@ proc_define(Environment *env, Object *obj) {
     }
 
     // Make a copy of the symbol and to make them permanent in the environment.
-    env_update_symbol(env, obj_duplicate(symbol), obj_duplicate(value));
+    ssize_t index = env_symbol_index_in_current_env(env, symbol);
+    if (index == -1) {
+        env_add_symbol(env, obj_duplicate(symbol), obj_duplicate(value));
+    } else {
+        env->buf[index].value = obj_duplicate(value);
+    }
+    return obj_nil;
+}
+
+Object *
+proc_set(Environment *env, Object *obj) {
+    if (obj == obj_nil || obj->cdr == obj_nil) {
+        error_push((Error){
+            .type = ERR_TYPE_RUNTIME,
+            .value = ERR_NOT_ENOUGH_ARGS,
+        });
+        return obj_err;
+    }
+
+    Object *symbol = obj->car;
+    if (symbol->type != OBJ_TYPE_SYMBOL) {
+        error_push((Error){
+            .type = ERR_TYPE_RUNTIME,
+            .value = ERR_WRONG_ARG_TYPE,
+        });
+        return obj_err;
+    }
+
+    Object *value = eval(env, obj->cdr->car);
+    if (value == obj_err) {
+        return obj_err;
+    }
+
+    ssize_t index = env_symbol_index_in_current_env(env, symbol);
+    if (index == -1) {
+        error_push((Error){
+            .type = ERR_TYPE_RUNTIME,
+            .value = ERR_SYMBOL_NOT_FOUND,
+        });
+        return obj_err;
+    }
+
+    env->buf[index].value = obj_duplicate(value);
     return obj_nil;
 }
 
+
+//
+// Evaluation.
+//
+
+Object *
+proc_eval(Environment *env, Object *obj) {
+    if (obj == obj_nil) {
+        error_push((Error){
+            .type = ERR_TYPE_RUNTIME,
+            .value = ERR_NOT_ENOUGH_ARGS,
+        });
+        return obj_err;
+    }
+    return eval(env, eval(env, obj->car));
+}
+
+// TODO: map
+// TODO: apply
+// TODO: filter
+
 // TODO: fixnum left/right shift, mask, invert
 // TODO: add primitives for type transforms: string->symbol, symbol->string, etc
 // TODO: implement support for semi-quotes
 // TODO: LAMBDA
 // TODO: let
-// TODO: Revise all instances where we are returning an object, since currently
-// we may be returning a pointer to an object instead of a new one. Check also
-// on eval function and everytime we do make_xxx(obj).