README

@@ -2,18 +2,10 @@
 jc.jai
 ------
 
-	# Direct installation
+	cd [jai install directory]/modules
-	cd [jai install dir]/modules
 	git clone https://git.brut.systems/judah/jc.jai.git jc
 	
-	# Indirect installation
-	git clone https://git.brut.systems/judah/jc.jai.git
-	
-	ln -s "/path/to/jc.jai" [jai install dir]/modules/jc # POSIX install
-	mklink /D "C:\path\to\jc.jai" [jai install dir]\jc   # Windows install
-	
 	#import "jc";
-	#import "jc/[module]";
 
 What
 ----

TODO

@@ -47,8 +47,8 @@
 	038 [encoding] add html support, via code - blocked by 008
 	039 [encoding] add rivit support, via code (https://judahcaruso.com/rivit.htm) - blocked by 038
 	040 [encoding] add markdown (commonmark?) support, via code - blocked by 038
+	042 [x] use absolute imports internally (ie. #import "jc/math"), update symlink/install process in README
 	
 
 *** DONE ***
 	010 [x] make base jai files standalone (ie. [array], [memory], etc... big maybe)
-	042 [x] use absolute imports internally (ie. #import "jc/math"), update symlink/install process in README

_run_all_tests.jai

@@ -2,9 +2,6 @@
    compiler :: #import "Compiler";
    compiler.set_build_options_dc(.{ do_output = false });
 
-   // @note(judah): we use relative imports here because that'll
-   // print cleaner file locations.
-
    #import,file "./array/module.jai"(true);
    #import,file "./encoding/module.jai"(true);
    #import,file "./hash/module.jai"(true);
@@ -12,8 +9,8 @@
    #import,file "./meta/module.jai"(true);
 
    rmath :: #import,file "./math/module.jai"(.radians, true);
-   dmath :: #import,file "./math/module.jai"(.degrees, true);
+   // dmath :: #import,file "./math/module.jai"(.degrees, true);
-   tmath :: #import,file "./math/module.jai"(.turns, true);
+   // tmath :: #import,file "./math/module.jai"(.turns, true);
 }
 
 

array/module.jai

@@ -5,5 +5,5 @@
 #scope_module;
 
 #if RUN_TESTS {
-   test :: #import "jc/test";
+   test :: #import,file "../test/module.jai";
 }

array/static_array.jai

@@ -77,20 +77,15 @@ make_dynamic :: (a: *Static_Array) -> [..]a.T {
 
 #scope_file;
 
+mem   :: #import,file "../memory/module.jai";
+basic :: #import "Basic"; // @future
+
 ensure_array_has_room :: (array: *Static_Array, count: int, loc := #caller_location) #expand {
    basic.assert(array.count + count <= array.capacity, "attempt to add too many elements! want: %, Max: %", array.count + count, array.capacity, loc = loc);
 }
 
-mem   :: #import "jc/memory";
-basic :: #import "Basic"; // @future
-
-
-// ----------------------------------------------------------
-// TESTS
-// ----------------------------------------------------------
-
 #if RUN_TESTS #run {
-   test :: #import "jc/test";
+   test :: #import,file "../test/module.jai";
 
    test.run("basic operations", (t) => {
       a: Static_Array(10, int);

encoding/base64.jai

@@ -156,14 +156,10 @@ encoded_length :: (count: int, with_padding := false) -> int {
 
 #scope_file;
 
-basic   :: #import "Basic"; // @future
+basic   :: #import "Basic";
-strings :: #import "String"; // @future
+strings :: #import "String";
 
 
-// ----------------------------------------------------------
-// TESTS
-// ----------------------------------------------------------
-
 #if RUN_TESTS #run {
    test.run("encodes", (t) => {
       str :: "Hello, World";

encoding/json.jai

@@ -603,8 +603,7 @@ at_end :: inline (p: *Parser) -> bool {
    return p.offset >= p.data.count.(u64);
 }
 
-
+basic   :: #import "Basic";
-basic   :: #import "Basic"; // @future
+strings :: #import "String";
-strings :: #import "String"; // @future
 
 

encoding/module.jai

@@ -7,5 +7,5 @@
 #scope_module;
 
 #if RUN_TESTS {
-   test :: #import "jc/test";
+   test :: #import,file "../test/module.jai";
 }

math/module.jai

@@ -6,7 +6,6 @@
 #load "vec.jai";
 #load "mat.jai";
 
-
 #scope_module;
 
 bounds_check_index :: ($$idx: int, $count: int, loc := #caller_location) #expand {
@@ -19,8 +18,8 @@ bounds_check_index :: ($$idx: int, $count: int, loc := #caller_location) #expand
 }
 
 
-basic :: #import "Basic"; // @future
+basic :: #import "Basic";
 
 #if RUN_TESTS {
-   test :: #import "jc/test";
+   test :: #import,file "../test/module.jai";
 }

math/vec.jai

@@ -349,8 +349,7 @@ quat :: (x: float = 0, y: float = 0, z: float = 0, w: float = 0) -> Quat #expand
    return .{ x = x, y = y, z = z, w = w };
 }
 
+#scope_file
 
-#scope_file;
+meta :: #import,file "../meta/module.jai";
-
-meta :: #import "jc/meta";
 math :: #import "Math"; // @future

memory/module.jai

@@ -164,20 +164,19 @@ arena_alloc :: (a: *Arena, count: int, alignment := Default_Align, loc := #calle
 }
 
 
+
 #scope_file;
 
-meta :: #import "jc/meta";
+// @note(judah): this will cause a cyclic import cycle if we import meta's module.jai
+// @todo(judah): switch to abslote imports everywhere (ie. "jc/meta")
+meta :: #import,file "../meta/type_info.jai";
+
 
 basic    :: #import "Basic"; // @future
 compiler :: #import "Compiler"; // @future
 
-
-// ----------------------------------------------------------
-// TESTS
-// ----------------------------------------------------------
-
 #if RUN_TESTS #run {
-   test :: #import "jc/test";
+   test :: #import,file "../test/module.jai";
 
    test.run("make:dynamic arrays", (t) => {
       a1 := make([..]int);

meta/module.jai

@@ -36,15 +36,10 @@ snake_to_pascal :: (name: string) -> string {
 
 #scope_module;
 
-mem :: #import "jc/memory";
+mem :: #import,file "../memory/module.jai";
-
-
-// ----------------------------------------------------------
-// TESTS
-// ----------------------------------------------------------
 
 #if RUN_TESTS {
-   test :: #import "jc/test";
+   test :: #import,file "../test/module.jai";
 
    #run test.run("snake_to_pascal", t => {
       test.expect(t, snake_to_pascal("some_name")  == "SomeName");

reload/examples/everything-you-need.jai

@@ -81,6 +81,8 @@ G: *struct {
    print("in: teardown\n");
 }
 
+#import "jx";
+
 #poke_name reload frame;
 #poke_name reload init;
 #poke_name reload setup;
@@ -90,6 +92,6 @@ G: *struct {
 // Use the default build options
 build_options :: () => reload.Simple_Build_Options.{};
 
-reload :: #import "jc/reload";
+reload :: #import "jx/reload";
 
 #import "Basic";

reload/examples/quickstart.jai

@@ -24,6 +24,7 @@ G: *struct {
 }
 
 
+#import "jx";
 #import "Basic";
 
 DISABLE_HOT_RELOADING :: false;
@@ -49,7 +50,7 @@ DISABLE_HOT_RELOADING :: false;
    }
 }
 else {
-   reload :: #import "jc/reload";
+   reload :: #import "jx/reload";
    #poke_name reload frame;
    #poke_name reload init;
    #poke_name reload setup;

reload/module.jai

@@ -154,11 +154,8 @@ user_options :: #run -> Simple_Build_Options {
    file_delete(temp_path);
 }
 
-
+#import "Basic";
-#scope_file;
+#import "File";
-
+#import "File_Utilities";
-#import "Basic"; // @future
+#import "String";
-#import "File"; // @future
+#import "Compiler";
-#import "File_Utilities"; // @future
-#import "String"; // @future
-#import "Compiler"; // @future

reload/reload_main.jai

@@ -230,8 +230,10 @@ else {
    #assert(false, "only windows, mac, and linux are supported for now");
 }
 
-basic   :: #import "Basic"; // @future
+#import "jx";
-system  :: #import "System"; // @future
+
-file    :: #import "File"; // @future
+basic   :: #import "Basic";
-futils  :: #import "File_Utilities"; // @future
+system  :: #import "System";
-strings :: #import "String"; // @future
+file    :: #import "File";
+futils  :: #import "File_Utilities";
+strings :: #import "String";