'#include_file' -> '#load'; '#include_folder' -> '#load_path'

diff --git a/bin/onyx b/bin/onyx
index 27ee833f4b9a6119cefa6523676a68ceec73d127..a49b7e574240b4e23a7eb14382048b80bf57533c 100755 (executable)
Binary files a/bin/onyx and b/bin/onyx differ

diff --git a/core/alloc.onyx b/core/alloc.onyx
index a121e6f42865e1bf157c9fd083a5080395a668f0..d6c47662b349b2b5658e85bf57fea9d5d226079b 100644 (file)
--- a/core/alloc.onyx
+++ b/core/alloc.onyx
@@ -1,9 +1,9 @@
 package core.alloc
 
-#include_file "core/alloc/arena"
-#include_file "core/alloc/fixed"
-#include_file "core/alloc/heap"
-#include_file "core/alloc/ring"
+#load "core/alloc/arena"
+#load "core/alloc/fixed"
+#load "core/alloc/heap"
+#load "core/alloc/ring"
 
 TEMPORARY_ALLOCATOR_SIZE :: 1 << 12; // 4Kb
 

diff --git a/core/alloc/heap.onyx b/core/alloc/heap.onyx
index 538e4507efc07e269244bf17bc8803c22b158da2..1989f59e9c26a5c632427073644349b428f55031 100644 (file)
--- a/core/alloc/heap.onyx
+++ b/core/alloc/heap.onyx
@@ -6,8 +6,8 @@ package core.alloc.heap
 // of the language. You will not make your own instance of the heap
 // allocator, since it controls WASM intrinsics such as memory_grow.
 
-#include_file "core/memory"
-#include_file "core/intrinsics/wasm"
+#load "core/memory"
+#load "core/intrinsics/wasm"
 
 use package core.intrinsics.wasm { memory_size, memory_grow }
 use package core.memory as memory

diff --git a/core/std/js.onyx b/core/std/js.onyx
index dfde761516840e4594c9d17aee2c1de4b025953b..2e9c9941ccb8dd1056400ffcb10aa8a2acce08df 100644 (file)
--- a/core/std/js.onyx
+++ b/core/std/js.onyx
@@ -2,19 +2,19 @@ package core
 
 
 
-#include_file "core/alloc"
-#include_file "core/array"
-#include_file "core/conv"
-#include_file "core/intrinsics/wasm"
-#include_file "core/map"
-#include_file "core/math"
-#include_file "core/memory"
-#include_file "core/random"
-#include_file "core/stdio"
-#include_file "core/string"
-#include_file "core/string/builder"
-#include_file "core/string/reader"
+#load "core/alloc"
+#load "core/array"
+#load "core/conv"
+#load "core/intrinsics/wasm"
+#load "core/map"
+#load "core/math"
+#load "core/memory"
+#load "core/random"
+#load "core/stdio"
+#load "core/string"
+#load "core/string/builder"
+#load "core/string/reader"
 
-#include_file "core/sys/js"
+#load "core/sys/js"
 
 

diff --git a/core/std/wasi.onyx b/core/std/wasi.onyx
index 7d8e73a9e12b2900cc5998475cd0802085829176..75fde6899d38d885366f10037422567df2554576 100644 (file)
--- a/core/std/wasi.onyx
+++ b/core/std/wasi.onyx
@@ -2,21 +2,21 @@ package core
 
 
 
-#include_file "core/alloc"
-#include_file "core/array"
-#include_file "core/conv"
-#include_file "core/file"
-#include_file "core/intrinsics/wasm"
-#include_file "core/map"
-#include_file "core/math"
-#include_file "core/memory"
-#include_file "core/random"
-#include_file "core/stdio"
-#include_file "core/string"
-#include_file "core/string/builder"
-#include_file "core/string/reader"
-#include_file "core/wasi"
+#load "core/alloc"
+#load "core/array"
+#load "core/conv"
+#load "core/file"
+#load "core/intrinsics/wasm"
+#load "core/map"
+#load "core/math"
+#load "core/memory"
+#load "core/random"
+#load "core/stdio"
+#load "core/string"
+#load "core/string/builder"
+#load "core/string/reader"
+#load "core/wasi"
 
-#include_file "core/sys/wasi"
+#load "core/sys/wasi"
 
 

diff --git a/core/sys/wasi.onyx b/core/sys/wasi.onyx
index 95c2893dc0e3f3f6b0df8e45a8e65091f066fe53..e2de1f69f3c03cbeee8dc4f4de0aee4ca2b8c8af 100644 (file)
--- a/core/sys/wasi.onyx
+++ b/core/sys/wasi.onyx
@@ -1,6 +1,6 @@
 package system
 
-#include_file "core/wasi"
+#load "core/wasi"
 
 use package wasi
 use package core

diff --git a/examples/01_hello_world.onyx b/examples/01_hello_world.onyx
index c1217e87c9266eaad4b5d5fbf9c795dfbaa82769..571b3ad504bc0e0cacd0c3866d44368f2468748f 100644 (file)
--- a/examples/01_hello_world.onyx
+++ b/examples/01_hello_world.onyx
@@ -15,7 +15,7 @@ package main
 // added to the queue of files to load. When all files in the queue have been parsed,
 // the compiler can continue with the compilation process. You can also include the
 // same file as many times as you want. The redudant copies will be discarded.
-#include_file "core/std/wasi"
+#load "core/std/wasi"
 
 // All of the functionality we need is in the 'core' package. Unlike other package systems,
 // there is no way to reference symbols in a package without specifically 'using' it. This

diff --git a/examples/02_variables.onyx b/examples/02_variables.onyx
index 98df7d32167bbfb078734350b67053f292bad682..f2f20ab56e26ee37e48f538d60be6479bd6a7e1a 100644 (file)
--- a/examples/02_variables.onyx
+++ b/examples/02_variables.onyx
@@ -1,7 +1,7 @@
 // This time, we are not adding, 'package main' to the top of the file, since
 // every file is automatically part of the main package unless specified otherwise.
 
-#include_file "core/std/wasi"
+#load "core/std/wasi"
 
 use package core
 

diff --git a/examples/03_basics.onyx b/examples/03_basics.onyx
index de8934539f0026db7094bdb36b7aed6485e67e25..0f5e5b49c2356bb05dd6a45e293d02bfb89028c4 100644 (file)
--- a/examples/03_basics.onyx
+++ b/examples/03_basics.onyx
@@ -1,6 +1,6 @@
 // Now, lets go over the basic types and control flow mechanisms in Onyx.
 
-#include_file "core/std/wasi"
+#load "core/std/wasi"
 
 use package core
 

diff --git a/examples/04_fixed_arrays.onyx b/examples/04_fixed_arrays.onyx
index 63b0b62f277cfd4014d0640ca63c047be0696c7b..aa516a16d2befc107aec12359730f4f287f3b651 100644 (file)
--- a/examples/04_fixed_arrays.onyx
+++ b/examples/04_fixed_arrays.onyx
@@ -15,7 +15,7 @@
 // This file will give examples of all of these things, as well as some of the gotchas
 // you need to be aware of.
 
-#include_file "core/std/wasi"
+#load "core/std/wasi"
 
 use package core
 

diff --git a/examples/05_slices.onyx b/examples/05_slices.onyx
index b0bf3ca24fc07088a1326e3ea03f18425c1e54a9..b8d94c49f13a1d6e23a8d7b55df96f6faa18fbf1 100644 (file)
--- a/examples/05_slices.onyx
+++ b/examples/05_slices.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/wasi"
+#load "core/std/wasi"
 
 use package core
 

diff --git a/examples/06_dynamic_arrays.onyx b/examples/06_dynamic_arrays.onyx
index b0bf3ca24fc07088a1326e3ea03f18425c1e54a9..b8d94c49f13a1d6e23a8d7b55df96f6faa18fbf1 100644 (file)
--- a/examples/06_dynamic_arrays.onyx
+++ b/examples/06_dynamic_arrays.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/wasi"
+#load "core/std/wasi"
 
 use package core
 

diff --git a/examples/07_structs.onyx b/examples/07_structs.onyx
index b0bf3ca24fc07088a1326e3ea03f18425c1e54a9..b8d94c49f13a1d6e23a8d7b55df96f6faa18fbf1 100644 (file)
--- a/examples/07_structs.onyx
+++ b/examples/07_structs.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/wasi"
+#load "core/std/wasi"
 
 use package core
 

diff --git a/examples/08_enums.onyx b/examples/08_enums.onyx
index b0bf3ca24fc07088a1326e3ea03f18425c1e54a9..b8d94c49f13a1d6e23a8d7b55df96f6faa18fbf1 100644 (file)
--- a/examples/08_enums.onyx
+++ b/examples/08_enums.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/wasi"
+#load "core/std/wasi"
 
 use package core
 

diff --git a/examples/09_for_loops.onyx b/examples/09_for_loops.onyx
index b0bf3ca24fc07088a1326e3ea03f18425c1e54a9..b8d94c49f13a1d6e23a8d7b55df96f6faa18fbf1 100644 (file)
--- a/examples/09_for_loops.onyx
+++ b/examples/09_for_loops.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/wasi"
+#load "core/std/wasi"
 
 use package core
 

diff --git a/examples/10_switch_statements.onyx b/examples/10_switch_statements.onyx
index b0bf3ca24fc07088a1326e3ea03f18425c1e54a9..b8d94c49f13a1d6e23a8d7b55df96f6faa18fbf1 100644 (file)
--- a/examples/10_switch_statements.onyx
+++ b/examples/10_switch_statements.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/wasi"
+#load "core/std/wasi"
 
 use package core
 

diff --git a/examples/11_map.onyx b/examples/11_map.onyx
index b0bf3ca24fc07088a1326e3ea03f18425c1e54a9..b8d94c49f13a1d6e23a8d7b55df96f6faa18fbf1 100644 (file)
--- a/examples/11_map.onyx
+++ b/examples/11_map.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/wasi"
+#load "core/std/wasi"
 
 use package core
 

diff --git a/examples/12_varargs.onyx b/examples/12_varargs.onyx
index b0bf3ca24fc07088a1326e3ea03f18425c1e54a9..b8d94c49f13a1d6e23a8d7b55df96f6faa18fbf1 100644 (file)
--- a/examples/12_varargs.onyx
+++ b/examples/12_varargs.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/wasi"
+#load "core/std/wasi"
 
 use package core
 

diff --git a/examples/13_use_keyword.onyx b/examples/13_use_keyword.onyx
index b0bf3ca24fc07088a1326e3ea03f18425c1e54a9..b8d94c49f13a1d6e23a8d7b55df96f6faa18fbf1 100644 (file)
--- a/examples/13_use_keyword.onyx
+++ b/examples/13_use_keyword.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/wasi"
+#load "core/std/wasi"
 
 use package core
 

diff --git a/examples/14_overloaded_procs.onyx b/examples/14_overloaded_procs.onyx
index b0bf3ca24fc07088a1326e3ea03f18425c1e54a9..b8d94c49f13a1d6e23a8d7b55df96f6faa18fbf1 100644 (file)
--- a/examples/14_overloaded_procs.onyx
+++ b/examples/14_overloaded_procs.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/wasi"
+#load "core/std/wasi"
 
 use package core
 

diff --git a/examples/15_polymorphic_procs.onyx b/examples/15_polymorphic_procs.onyx
index b0bf3ca24fc07088a1326e3ea03f18425c1e54a9..b8d94c49f13a1d6e23a8d7b55df96f6faa18fbf1 100644 (file)
--- a/examples/15_polymorphic_procs.onyx
+++ b/examples/15_polymorphic_procs.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/wasi"
+#load "core/std/wasi"
 
 use package core
 

diff --git a/examples/16_pipe_operator.onyx b/examples/16_pipe_operator.onyx
index fd634832e0c867d0cb69bee65b414637073c3574..db30ce5f7756fc573b1a3c0f309ed5adbd3c1c53 100644 (file)
--- a/examples/16_pipe_operator.onyx
+++ b/examples/16_pipe_operator.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/wasi"
+#load "core/std/wasi"
 
 use package core { println }
 

diff --git a/include/onyxastnodes.h b/include/onyxastnodes.h
index d94d8e5ec14e8dd3b0b8f13f5ff5edc492d2d0dd..5c319b368eeb9f83c4a6cc004d247f3c98e75bc6 100644 (file)
--- a/include/onyxastnodes.h
+++ b/include/onyxastnodes.h
@@ -86,8 +86,8 @@ typedef enum AstKind {
     Ast_Kind_Error,
     Ast_Kind_Program,
     Ast_Kind_Package,
-    Ast_Kind_Include_File,
-    Ast_Kind_Include_Folder,
+    Ast_Kind_Load_File,
+    Ast_Kind_Load_Path,
     Ast_Kind_Use_Package,
     Ast_Kind_Alias,
     Ast_Kind_Memres,
@@ -793,8 +793,8 @@ extern const char* entity_state_strings[Entity_State_Count];
 typedef enum EntityType {
     Entity_Type_Unknown,
 
-    Entity_Type_Include_Folder,
-    Entity_Type_Include_File,
+    Entity_Type_Load_Path,
+    Entity_Type_Load_File,
     Entity_Type_Use_Package,
     Entity_Type_String_Literal,
     Entity_Type_File_Contents,

diff --git a/misc/onyx.sublime-syntax b/misc/onyx.sublime-syntax
index bb27b1447436cfe9afc04cd74548c456a2edf6ae..70ab16248b8683d2b941b90f553dd185c1391706 100644 (file)
--- a/misc/onyx.sublime-syntax
+++ b/misc/onyx.sublime-syntax
@@ -48,17 +48,20 @@ contexts:
     - match: '#[a-zA-Z_]+'
       scope: keyword.other.onyx
 
-    - match: '([a-zA-Z_][a-zA-Z0-9_]*)\s*::\s*proc'
+    - match: '([a-zA-Z_][a-zA-Z0-9_]*)\s*::\s*(proc)'
       captures:
         1: entity.name.function
+        2: keyword.control.onyx
 
-    - match: '([a-zA-Z_][a-zA-Z0-9_]*)\s*::\s*struct'
+    - match: '([a-zA-Z_][a-zA-Z0-9_]*)\s*::\s*(struct)'
       captures:
         1: entity.name.struct
+        2: keyword.control.onyx
 
-    - match: '([a-zA-Z_][a-zA-Z0-9_]*)\s*::\s*enum'
+    - match: '([a-zA-Z_][a-zA-Z0-9_]*)\s*::\s*(enum)'
       captures:
         1: entity.name.enum
+        2: keyword.control.onyx
 
     - match: '([a-zA-Z_][a-zA-Z0-9_\.]+)\s*\('
       captures:

diff --git a/progs/odin_example.onyx b/progs/odin_example.onyx
index 2642bbc2b18990fd2189cbac35e1b043543f8555..7dd0778f1895bec4d92c45ba1e4bb837140f1e14 100644 (file)
--- a/progs/odin_example.onyx
+++ b/progs/odin_example.onyx
@@ -1,5 +1,5 @@
-#include_file "core/std/wasi"
-#include_file "progs/foo_test"
+#load "core/std/wasi"
+#load "progs/foo_test"
 
 use package core
 

diff --git a/progs/particle_sym.onyx b/progs/particle_sym.onyx
index 835317432908bea5619ff20b6a6ae0052f38f16e..9c1dbef0b33e221bec4ceae8bf004760b15a9bd1 100644 (file)
--- a/progs/particle_sym.onyx
+++ b/progs/particle_sym.onyx
@@ -1,7 +1,7 @@
 package main
 
-#include_file "core/std/wasi"
-#include_file "core/simd_intrinsics"
+#load "core/std/wasi"
+#load "core/simd_intrinsics"
 
 use package core
 use package simd

diff --git a/progs/poly_solidify.onyx b/progs/poly_solidify.onyx
index ae59bc0cec8531f3070b75fe6e1dea05fa2fd42f..ca4db5c6c320159fde8987e9cb102035c71c65fa 100644 (file)
--- a/progs/poly_solidify.onyx
+++ b/progs/poly_solidify.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/wasi"
+#load "core/std/wasi"
 
 use package core
 

diff --git a/progs/simd_test.onyx b/progs/simd_test.onyx
index e4d316048908d9a752aec088955c423ccebfb24f..7ec1563f135e39aa4d12a5e74e38c9e567242739 100644 (file)
--- a/progs/simd_test.onyx
+++ b/progs/simd_test.onyx
@@ -1,7 +1,7 @@
 package main
 
-#include_file "core/std/wasi"
-#include_file "core/intrinsics/simd"
+#load "core/std/wasi"
+#load "core/intrinsics/simd"
 
 use package core
 use package core.intrinsics.simd

diff --git a/progs/vararg_test.onyx b/progs/vararg_test.onyx
index 1c425ec6c7a2a2e4c85142c027b42a41b16261f7..0aeefed2f806811514bb533c82a85f902e108adb 100644 (file)
--- a/progs/vararg_test.onyx
+++ b/progs/vararg_test.onyx
@@ -1,6 +1,6 @@
 package main
 
-#include_file "core/std/wasi"
+#load "core/std/wasi"
 
 use package core;
 

diff --git a/progs/wasi_test.onyx b/progs/wasi_test.onyx
index 9d8bf682642fdf8f4acfc5fa8f8bafd496e258f0..70f6380f39de3aebcb25532ce103a0a25cb0d336 100644 (file)
--- a/progs/wasi_test.onyx
+++ b/progs/wasi_test.onyx
@@ -1,6 +1,6 @@
 package main
 
-#include_file "core/std/wasi"
+#load "core/std/wasi"
 
 // NOTE: Didn't realize this would work so easily
 use package core { string_builder_append as sba }

diff --git a/src/onyx.c b/src/onyx.c
index 1f743b27211dd131dabf9950a51e32dd74ef9da5..1b015aa1b79980a3b4a124fea097f3eb6791e244 100644 (file)
--- a/src/onyx.c
+++ b/src/onyx.c
@@ -141,8 +141,8 @@ typedef struct CompilerState {
 
 static char* lookup_included_file(CompilerState* cs, char* filename);
 
-static AstInclude* create_include_file(bh_allocator alloc, char* filename) {
-    AstInclude* include_node = onyx_ast_node_new(alloc, sizeof(AstInclude), Ast_Kind_Include_File);
+static AstInclude* create_load(bh_allocator alloc, char* filename) {
+    AstInclude* include_node = onyx_ast_node_new(alloc, sizeof(AstInclude), Ast_Kind_Load_File);
     include_node->name = filename;
 
     return include_node;
@@ -174,9 +174,9 @@ static void compiler_state_init(CompilerState* compiler_state, OnyxCompileOption
     // NOTE: Add builtin entities to pipeline.
     entity_heap_insert(&compiler_state->prog_info.entities, ((Entity) {
         .state = Entity_State_Parse_Builtin,
-        .type = Entity_Type_Include_File,
+        .type = Entity_Type_Load_File,
         .package = NULL,
-        .include = create_include_file(compiler_state->sp_alloc, "core/builtin"),
+        .include = create_load(compiler_state->sp_alloc, "core/builtin"),
     }));
 
     entity_heap_insert(&compiler_state->prog_info.entities, ((Entity) {
@@ -195,9 +195,9 @@ static void compiler_state_init(CompilerState* compiler_state, OnyxCompileOption
     bh_arr_each(const char *, filename, opts->files) {
         entity_heap_insert(&compiler_state->prog_info.entities, ((Entity) {
             .state = Entity_State_Parse,
-            .type = Entity_Type_Include_File,
+            .type = Entity_Type_Load_File,
             .package = NULL,
-            .include = create_include_file(compiler_state->sp_alloc, (char *) *filename),
+            .include = create_load(compiler_state->sp_alloc, (char *) *filename),
         }));
     }
 }
@@ -255,17 +255,17 @@ static void merge_parse_results(CompilerState* compiler_state, ParseResults* res
         ent.scope   = n->scope;
 
         switch (nkind) {
-            case Ast_Kind_Include_File: {
+            case Ast_Kind_Load_File: {
                 ent.state = Entity_State_Parse;
-                ent.type = Entity_Type_Include_File;
+                ent.type = Entity_Type_Load_File;
                 ent.include = (AstInclude *) node;
                 entity_heap_insert(&compiler_state->prog_info.entities, ent);
                 break;
             }
                                    
-            case Ast_Kind_Include_Folder: {
+            case Ast_Kind_Load_Path: {
                 ent.state = Entity_State_Parse;
-                ent.type = Entity_Type_Include_Folder;
+                ent.type = Entity_Type_Load_Path;
                 ent.include = (AstInclude *) node;
                 entity_heap_insert(&compiler_state->prog_info.entities, ent);
                 break;
@@ -428,17 +428,17 @@ static CompilerProgress process_source_file(CompilerState* compiler_state, char*
     }
 }
 
-static b32 process_include_entity(CompilerState* compiler_state, Entity* ent) {
-    assert(ent->type == Entity_Type_Include_File || ent->type == Entity_Type_Include_Folder);
+static b32 process_load_entity(CompilerState* compiler_state, Entity* ent) {
+    assert(ent->type == Entity_Type_Load_File || ent->type == Entity_Type_Load_Path);
     AstInclude* include = ent->include;
 
-    if (include->kind == Ast_Kind_Include_File) {
+    if (include->kind == Ast_Kind_Load_File) {
         char* filename = lookup_included_file(compiler_state, include->name);
         char* formatted_name = bh_strdup(global_heap_allocator, filename);
 
         process_source_file(compiler_state, formatted_name);
 
-    } else if (include->kind == Ast_Kind_Include_Folder) {
+    } else if (include->kind == Ast_Kind_Load_Path) {
         bh_arr_push(compiler_state->options->included_folders, include->name);
     }
 
@@ -459,7 +459,7 @@ static b32 process_entity(CompilerState* compiler_state, Entity* ent) {
 
     switch (ent->state) {
         case Entity_State_Parse_Builtin:
-            process_include_entity(compiler_state, ent);
+            process_load_entity(compiler_state, ent);
             ent->state = Entity_State_Finalized;
 
             if (onyx_has_errors()) return 0;
@@ -469,7 +469,7 @@ static b32 process_entity(CompilerState* compiler_state, Entity* ent) {
             break;
 
         case Entity_State_Parse:
-            process_include_entity(compiler_state, ent);
+            process_load_entity(compiler_state, ent);
             ent->state = Entity_State_Finalized;
             break;
 

diff --git a/src/onyxclone.c b/src/onyxclone.c
index b731efe3f9ad2a7c883ca164cdf6bc72fdda743d..cc983dbd25d0fd3c4fd9f9a854a04abf4dbc56f6 100644 (file)
--- a/src/onyxclone.c
+++ b/src/onyxclone.c
@@ -27,8 +27,8 @@ static inline i32 ast_kind_to_size(AstNode* node) {
         case Ast_Kind_Error: return sizeof(AstNode);
         case Ast_Kind_Program: return sizeof(AstNode);
         case Ast_Kind_Package: return sizeof(AstPackage);
-        case Ast_Kind_Include_File: return sizeof(AstInclude);
-        case Ast_Kind_Include_Folder: return sizeof(AstInclude);
+        case Ast_Kind_Load_File: return sizeof(AstInclude);
+        case Ast_Kind_Load_Path: return sizeof(AstInclude);
         case Ast_Kind_Use_Package: return sizeof(AstUsePackage);
         case Ast_Kind_Alias: return sizeof(AstAlias);
         case Ast_Kind_Memres: return sizeof(AstMemRes);

diff --git a/src/onyxparser.c b/src/onyxparser.c
index 2c11b7c9eadaf538be409e4f07edf595e3430ce5..407b05f6bd5be9b97c2a521637d2b87773dd0e94 100644 (file)
--- a/src/onyxparser.c
+++ b/src/onyxparser.c
@@ -2121,8 +2121,8 @@ static AstNode* parse_top_level_statement(OnyxParser* parser) {
             while (parser->curr->type == '#') {
                 OnyxToken* dir_token = parser->curr;
 
-                if (parse_possible_directive(parser, "include_file")) {
-                    AstInclude* include = make_node(AstInclude, Ast_Kind_Include_File);
+                if (parse_possible_directive(parser, "load")) {
+                    AstInclude* include = make_node(AstInclude, Ast_Kind_Load_File);
                     include->token = dir_token;
 
                     OnyxToken* str_token = expect_token(parser, Token_Type_Literal_String);
@@ -2134,8 +2134,8 @@ static AstNode* parse_top_level_statement(OnyxParser* parser) {
 
                     return (AstNode *) include;
                 }
-                else if (parse_possible_directive(parser, "include_folder")) {
-                    AstInclude* include = make_node(AstInclude, Ast_Kind_Include_Folder);
+                else if (parse_possible_directive(parser, "load_path")) {
+                    AstInclude* include = make_node(AstInclude, Ast_Kind_Load_Path);
                     include->token = dir_token;
                     
                     OnyxToken* str_token = expect_token(parser, Token_Type_Literal_String);
@@ -2291,8 +2291,8 @@ ParseResults onyx_parse(OnyxParser *parser) {
                 if (parser->hit_unexpected_token) return parser->results;
 
                 switch (curr_stmt->kind) {
-                    case Ast_Kind_Include_File:
-                    case Ast_Kind_Include_Folder:
+                    case Ast_Kind_Load_File:
+                    case Ast_Kind_Load_Path:
                         add_node_to_process(parser, curr_stmt);
                         break;
 

diff --git a/src/onyxutils.c b/src/onyxutils.c
index ace28bbe647b0a40058fa2f98c154cbfa16fd58a..3647fbd49be1b5670d400ba9c1637d021df7502b 100644 (file)
--- a/src/onyxutils.c
+++ b/src/onyxutils.c
@@ -108,8 +108,8 @@ const char* entity_state_strings[Entity_State_Count] = {
 
 const char* entity_type_strings[Entity_Type_Count] = {
     "Unknown",
-    "Include Folder",
-    "Include File",
+    "Add to Load Path",
+    "Load File",
     "Use Package",
     "String Literal",
     "File Contents",

diff --git a/tests/aoc-2020/day1.onyx b/tests/aoc-2020/day1.onyx
index a228699e4d734155b1021dbb780862daf970b552..b8a0b1a0889008af3017c33d7f9b36b8db18545c 100644 (file)
--- a/tests/aoc-2020/day1.onyx
+++ b/tests/aoc-2020/day1.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/js"
+#load "core/std/js"
 
 use package core
 

diff --git a/tests/aoc-2020/day10.onyx b/tests/aoc-2020/day10.onyx
index f1d9b5b4c72baf8ab616aef27bd870ce5015f07d..4477bf84bd41b22ba7f6f7af49310aceee4c9b07 100644 (file)
--- a/tests/aoc-2020/day10.onyx
+++ b/tests/aoc-2020/day10.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/js"
+#load "core/std/js"
 
 use package core
 use package core.string.reader as reader

diff --git a/tests/aoc-2020/day11.onyx b/tests/aoc-2020/day11.onyx
index 0eed2fe7bfc2830c818533be30191f92fe8bcf6a..e038e0f79d9d53bff10057ebe15c61625e66f8aa 100644 (file)
--- a/tests/aoc-2020/day11.onyx
+++ b/tests/aoc-2020/day11.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/js"
+#load "core/std/js"
 
 use package core
 use package core.string.reader as reader

diff --git a/tests/aoc-2020/day12.onyx b/tests/aoc-2020/day12.onyx
index 012a349201e3c29355a012a921514808d44ac548..0b7c70d3d6aeddf2577a1fa7d174508ee2a16a4b 100644 (file)
--- a/tests/aoc-2020/day12.onyx
+++ b/tests/aoc-2020/day12.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/js"
+#load "core/std/js"
 
 use package core
 use package core.string.reader as reader

diff --git a/tests/aoc-2020/day13.onyx b/tests/aoc-2020/day13.onyx
index 4cba8910ab567222e6a0b34d31e95ee84fb6c96f..adbf691b218f6170885e63bc9e96e3f0a1edbf30 100644 (file)
--- a/tests/aoc-2020/day13.onyx
+++ b/tests/aoc-2020/day13.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/js"
+#load "core/std/js"
 
 use package core
 use package core.string.reader as reader

diff --git a/tests/aoc-2020/day14.onyx b/tests/aoc-2020/day14.onyx
index e5e583a23a4d9c9bf31f512ea71ccac09f50f686..4e1651c1fce6776183c1ebcdeb09e40d8564ef60 100644 (file)
--- a/tests/aoc-2020/day14.onyx
+++ b/tests/aoc-2020/day14.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/js"
+#load "core/std/js"
 
 use package core
 use package core.string.reader as reader

diff --git a/tests/aoc-2020/day15.onyx b/tests/aoc-2020/day15.onyx
index aeb5332f93cf923128157e64dca3c9cdc2e3e82b..2cc74023f14c52cd0dc1861b57d09b5c2dff82e2 100644 (file)
--- a/tests/aoc-2020/day15.onyx
+++ b/tests/aoc-2020/day15.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/js"
+#load "core/std/js"
 
 use package core
 use package core.string.reader as reader

diff --git a/tests/aoc-2020/day16.onyx b/tests/aoc-2020/day16.onyx
index d5a8e9f223752a860651cc332b011ff2616b2192..578847f9be8d43d4c745b04cd2c5b21cfb3cabf1 100644 (file)
--- a/tests/aoc-2020/day16.onyx
+++ b/tests/aoc-2020/day16.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/js"
+#load "core/std/js"
 
 use package core
 use package core.string.reader as reader

diff --git a/tests/aoc-2020/day17.onyx b/tests/aoc-2020/day17.onyx
index 867ab5729a03650af42448ce572d5746c70f779e..61cee9b441581d95287b58cbfca67dbeb53c7100 100644 (file)
--- a/tests/aoc-2020/day17.onyx
+++ b/tests/aoc-2020/day17.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/js"
+#load "core/std/js"
 
 use package core
 use package core.string.reader as reader

diff --git a/tests/aoc-2020/day18.onyx b/tests/aoc-2020/day18.onyx
index e9d9d149c8ba5c30a4ba77cc6aa55cb5a5c21000..93ec4a274ac84f6cbfba10c6612b5feb1c6a5593 100644 (file)
--- a/tests/aoc-2020/day18.onyx
+++ b/tests/aoc-2020/day18.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/js"
+#load "core/std/js"
 
 use package core
 use package core.string.reader as reader

diff --git a/tests/aoc-2020/day19.onyx b/tests/aoc-2020/day19.onyx
index 76ebe0f810f443f516b8a695f7d32d2218378bc9..d503098b3ec66902a46fb0f54a103b964247c0f5 100644 (file)
--- a/tests/aoc-2020/day19.onyx
+++ b/tests/aoc-2020/day19.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/js"
+#load "core/std/js"
 
 use package core
 use package core.string.reader as reader

diff --git a/tests/aoc-2020/day2.onyx b/tests/aoc-2020/day2.onyx
index 64f54bc1a88b0ca5508716409d93f0ece26bd0b4..2685e06512929b720a2e80ed17e930e2a8831250 100644 (file)
--- a/tests/aoc-2020/day2.onyx
+++ b/tests/aoc-2020/day2.onyx
@@ -1,6 +1,6 @@
 package main
 
-#include_file "core/std/js"
+#load "core/std/js"
 
 use package core
 

diff --git a/tests/aoc-2020/day20.onyx b/tests/aoc-2020/day20.onyx
index 118cc37347259e46918198cfb31663422792e722..988e5a81f6199db7819d4c040142b632007204dc 100644 (file)
--- a/tests/aoc-2020/day20.onyx
+++ b/tests/aoc-2020/day20.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/js"
+#load "core/std/js"
 
 use package core
 use package core.string.reader as reader

diff --git a/tests/aoc-2020/day21.onyx b/tests/aoc-2020/day21.onyx
index 2b1b47f20cbd97266961adff81ba7d035e0f2865..d092ab98c4362d9256ee4b369ad606dadf0fda63 100644 (file)
--- a/tests/aoc-2020/day21.onyx
+++ b/tests/aoc-2020/day21.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/js"
+#load "core/std/js"
 
 use package core
 use package core.string.reader as reader

diff --git a/tests/aoc-2020/day22.onyx b/tests/aoc-2020/day22.onyx
index d7e8c308ed9527d361e9dc870640341a6b08026a..c4c1622beefe652b6a6d2e314430582421b6d61f 100644 (file)
--- a/tests/aoc-2020/day22.onyx
+++ b/tests/aoc-2020/day22.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/js"
+#load "core/std/js"
 
 use package core
 use package core.string.reader as reader

diff --git a/tests/aoc-2020/day23.onyx b/tests/aoc-2020/day23.onyx
index 4741d07ae509ee126305ccbf19a626f14aef6fee..886d91612b68ce0ddea81c49cbe8aeda6d1caf3c 100644 (file)
--- a/tests/aoc-2020/day23.onyx
+++ b/tests/aoc-2020/day23.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/js"
+#load "core/std/js"
 
 use package core
 

diff --git a/tests/aoc-2020/day24.onyx b/tests/aoc-2020/day24.onyx
index 8d82cbaec460fbc9cbe40f7f2edf40750bd1d45f..61b6320f1ae2e51eda98bcbbff5fca8295f18c51 100644 (file)
--- a/tests/aoc-2020/day24.onyx
+++ b/tests/aoc-2020/day24.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/js"
+#load "core/std/js"
 
 use package core
 use package core.string.reader as reader

diff --git a/tests/aoc-2020/day25.onyx b/tests/aoc-2020/day25.onyx
index 210e5039ba56b644618efb888966898a5562301b..09d8994144919fcd945e403e216a2afbe71eca3a 100644 (file)
--- a/tests/aoc-2020/day25.onyx
+++ b/tests/aoc-2020/day25.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/js"
+#load "core/std/js"
 
 use package core
 use package core.string.reader as reader

diff --git a/tests/aoc-2020/day3.onyx b/tests/aoc-2020/day3.onyx
index 9ae9c6978ad27422d44129414e33a90a1ad54678..95eb223d594ec7f55310394660eb7a26e141f25a 100644 (file)
--- a/tests/aoc-2020/day3.onyx
+++ b/tests/aoc-2020/day3.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/js"
+#load "core/std/js"
 
 use package core
 

diff --git a/tests/aoc-2020/day4.onyx b/tests/aoc-2020/day4.onyx
index f53eef82e92ab10448cc42649cc5a9fdde328e38..51387b42105fd935e7a929514cca1c3a1e80fd62 100644 (file)
--- a/tests/aoc-2020/day4.onyx
+++ b/tests/aoc-2020/day4.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/js"
+#load "core/std/js"
 
 use package core
 

diff --git a/tests/aoc-2020/day5.onyx b/tests/aoc-2020/day5.onyx
index 4698e85a986bc0b7a506dba06f3a8befa7c7c525..c2ac235835bfcea287591140ab0e8e664e5d6066 100644 (file)
--- a/tests/aoc-2020/day5.onyx
+++ b/tests/aoc-2020/day5.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/js"
+#load "core/std/js"
 
 use package core
 

diff --git a/tests/aoc-2020/day6.onyx b/tests/aoc-2020/day6.onyx
index 0a6c03479092a953e5713160cbc19b1b3a53310d..adf23213c5d517424775c3b20f29c29ef45c4124 100644 (file)
--- a/tests/aoc-2020/day6.onyx
+++ b/tests/aoc-2020/day6.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/js"
+#load "core/std/js"
 
 use package core
 

diff --git a/tests/aoc-2020/day7.onyx b/tests/aoc-2020/day7.onyx
index 4e35231f61bd5435bb625773e6175bb8aab68c3a..08dceae3b0d2a4811205f1d3f82d3c05964f599c 100644 (file)
--- a/tests/aoc-2020/day7.onyx
+++ b/tests/aoc-2020/day7.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/js"
+#load "core/std/js"
 
 use package core
 use package core.string.reader as reader

diff --git a/tests/aoc-2020/day8.onyx b/tests/aoc-2020/day8.onyx
index 59b404f396445f72ad74256a03a51bf2a61dd9b0..e197fa7c8818bc5da77eb91b4db4527b5a5c11e8 100644 (file)
--- a/tests/aoc-2020/day8.onyx
+++ b/tests/aoc-2020/day8.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/js"
+#load "core/std/js"
 
 use package core
 use package core.string.reader as reader

diff --git a/tests/aoc-2020/day9.onyx b/tests/aoc-2020/day9.onyx
index fe162d2dd7a7b66cd6d64cf2f062432f6a5c10a6..15d6b2921feb99ceb29f1feb0e4b59221ef6d50b 100644 (file)
--- a/tests/aoc-2020/day9.onyx
+++ b/tests/aoc-2020/day9.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/js"
+#load "core/std/js"
 
 use package core
 use package core.string.reader as reader

diff --git a/tests/array_struct_robustness.onyx b/tests/array_struct_robustness.onyx
index 1c12ce4e7cb494617f3a56eb363b9ff97de5b8c4..8517edf1c48b5de6edc4d57d84ffedd24bf7697a 100644 (file)
--- a/tests/array_struct_robustness.onyx
+++ b/tests/array_struct_robustness.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/js"
+#load "core/std/js"
 
 use package core
 

diff --git a/tests/compile_time_procedures.onyx b/tests/compile_time_procedures.onyx
index 4ecdb2196fac5a7611bed87220cc413709e0a20e..518fe9caa617d182cc06b2cd008490b222c0299a 100644 (file)
--- a/tests/compile_time_procedures.onyx
+++ b/tests/compile_time_procedures.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/js"
+#load "core/std/js"
 
 use package core
 

diff --git a/tests/general1.onyx b/tests/general1.onyx
index 1dc092e2b47b10dcdb39a023e204a37c02cd53b9..d5d870e1ce096e0b1a96d604ee926b1f593b9b5b 100644 (file)
--- a/tests/general1.onyx
+++ b/tests/general1.onyx
@@ -1,6 +1,6 @@
 package main
 
-#include_file "core/std/js"
+#load "core/std/js"
 
 use package core
 

diff --git a/tests/hello_world.onyx b/tests/hello_world.onyx
index 7d031f3fd899ad0b13c0e269f7354f05a70cc4d3..3a309801963d2e5571a917f0d6bbbeec456bf2a1 100644 (file)
--- a/tests/hello_world.onyx
+++ b/tests/hello_world.onyx
@@ -1,6 +1,6 @@
 package main
 
-#include_file "core/std/js"
+#load "core/std/js"
 
 use package core
 

diff --git a/tests/i32map.onyx b/tests/i32map.onyx
index 4bf31cd738d5f4d6c8e6986b298c881d48acdc9c..d8cf721fe69d5aba7464f1a270c764eebc6a44d8 100644 (file)
--- a/tests/i32map.onyx
+++ b/tests/i32map.onyx
@@ -1,6 +1,6 @@
 package main
 
-#include_file "core/std/js"
+#load "core/std/js"
 
 use package core
 

diff --git a/tests/overload_with_autocast.onyx b/tests/overload_with_autocast.onyx
index 7788c70fd6bc12cb4ce09a975f7e8a295b2d1b8f..9c427e59cefea2893297368c9b4e323ff626b3ea 100644 (file)
--- a/tests/overload_with_autocast.onyx
+++ b/tests/overload_with_autocast.onyx
@@ -1,4 +1,4 @@
-#include_file "core/std/js"
+#load "core/std/js"
 
 use package core
 

diff --git a/tests/struct_robustness.onyx b/tests/struct_robustness.onyx
index 7e7586f74b09cfe0ddbc18a3612a55668224ae63..fb526c4adf3b3b2f9c426277ed345828570ed7b0 100644 (file)
--- a/tests/struct_robustness.onyx
+++ b/tests/struct_robustness.onyx
@@ -192,4 +192,4 @@ main :: proc (args: [] cstr) {
     }
 }
 
-#include_file "core/std/js"
\ No newline at end of file
+#load "core/std/js"
\ No newline at end of file

diff --git a/tests/vararg_test.onyx b/tests/vararg_test.onyx
index bea6b5c7b24e104bf79cc3d79ceeebfc39fb0282..988f355ed009874f19747b075efe1a94d06e1ee1 100644 (file)
--- a/tests/vararg_test.onyx
+++ b/tests/vararg_test.onyx
@@ -1,6 +1,6 @@
 package main
 
-#include_file "core/std/js"
+#load "core/std/js"
 
 use package core;