Change environments to use darray.h

1 files changed, 3 insertions, 8 deletions

diff --git a/src/bootstrap/gc.c b/src/bootstrap/gc.c
index 48499ac..d281536 100644
--- a/src/bootstrap/gc.c
+++ b/src/bootstrap/gc.c
@@ -75,8 +75,8 @@ mark_environment(Environment *env) {
         return;
     }
     env->marked = true;
-    for (size_t i = 0; i < env->size; i++) {
-        EnvEntry *entry = &env->buf[i];
+    for (size_t i = 0; i < array_size(env->entries); i++) {
+        EnvEntry *entry = &env->entries[i];
         mark_obj(entry->symbol);
         mark_obj(entry->value);
     }
@@ -132,12 +132,7 @@ mark_and_sweep(void) {
     for (size_t i = 0; i < array_cap(gc.envs); i++) {
         Environment *env = &gc.envs[i];
         if (!env->marked) {
-            if (env->buf != NULL) {
-                free(env->buf);
-                env->buf = NULL;
-                env->size = 0;
-                env->cap = 0;
-            }
+            array_free(env->entries);
             gc.free_envs.buf[gc.free_envs.size++] = i;
         }
         env->marked = false;