From e6bc77bb176ae4d63f2b32b70c0dd31534fe1394 Mon Sep 17 00:00:00 2001
From: Judah Caruso <judahrcr@gmail.com>
Date: Wed, 21 May 2025 17:06:08 -0600
Subject: [PATCH] fix reload module

---
 reload/module.jai      |  2 +-
 reload/reload_main.jai | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/reload/module.jai b/reload/module.jai
index 777a55a..4d05b14 100644
--- a/reload/module.jai
+++ b/reload/module.jai
@@ -113,7 +113,7 @@ user_options :: #run -> Simple_Build_Options {
          #load "%1";
 
          main :: () {
-            (#import "jx/reload").reload_main();
+            (#import "jc/reload").reload_main();
          }
       END, file_path);
 
diff --git a/reload/reload_main.jai b/reload/reload_main.jai
index f184ad4..8bb7618 100644
--- a/reload/reload_main.jai
+++ b/reload/reload_main.jai
@@ -2,7 +2,7 @@ reload_main :: () {
    system_allocator := context.allocator;
 
    // Ensure we're not allocating anywhere unexpected
-   context.allocator = Crash_Allocator;
+   context.allocator = mem.Crash_Allocator;
 
    basic.set_working_directory(strings.path_strip_filename(system.get_path_of_running_executable()));
 
@@ -25,17 +25,17 @@ reload_main :: () {
       basic.free(lib_versions.data,, allocator = system_allocator);
    }
 
-   print("host: allocating % bytes memory (% for state)\n", H.max_memory, H.state_size);
+   basic.print("host: allocating % bytes memory (% for state)\n", H.max_memory, H.state_size);
 
    lib_memory := basic.alloc(xx H.max_memory,, allocator = system_allocator);
    assert(lib_memory != null, "host: failed to allocate memory!");
    defer free(lib_memory,, allocator = system_allocator);
 
-   lib_arena: Arena;
-   init_arena(*lib_arena, lib_memory, H.max_memory);
+   lib_arena: mem.Arena;
+   mem.init_arena(*lib_arena, lib_memory, H.max_memory);
 
    lib_allocator := Allocator.{
-      proc = arena_allocator_proc,
+      proc = mem.arena_allocator_proc,
       data = *lib_arena,
    };
 
@@ -95,8 +95,7 @@ reload_main :: () {
 
             lib_memory = basic.alloc(xx new_msize,, allocator = system_allocator);
             basic.assert(lib_memory != null, "host: failed to allocator new memory");
-
-            init_arena(*lib_arena, lib_memory, new_msize);
+            mem.init_arena(*lib_arena, lib_memory, new_msize);
          }
 
          // in either case, we want ensure lib_state is at the start of our program's memory.
@@ -230,6 +229,8 @@ else {
    #assert(false, "only windows, mac, and linux are supported for now");
 }
 
+mem :: #import "jc/memory";
+
 basic   :: #import "Basic"; // @future
 system  :: #import "System"; // @future
 file    :: #import "File"; // @future