From: Brendan Hansen Date: Sun, 3 Jan 2021 15:52:05 +0000 (-0600) Subject: '#include_file' -> '#load'; '#include_folder' -> '#load_path' X-Git-Url: https://git.brendanfh.com/?a=commitdiff_plain;h=5b210a9f3f12cf0309fbfb1b89398b731d798cd8;p=onyx.git '#include_file' -> '#load'; '#include_folder' -> '#load_path' --- diff --git a/bin/onyx b/bin/onyx index 27ee833f..a49b7e57 100755 Binary files a/bin/onyx and b/bin/onyx differ diff --git a/core/alloc.onyx b/core/alloc.onyx index a121e6f4..d6c47662 100644 --- 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 538e4507..1989f59e 100644 --- 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 dfde7615..2e9c9941 100644 --- 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 7d8e73a9..75fde689 100644 --- 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 95c2893d..e2de1f69 100644 --- 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 c1217e87..571b3ad5 100644 --- 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 98df7d32..f2f20ab5 100644 --- 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 de893453..0f5e5b49 100644 --- 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 63b0b62f..aa516a16 100644 --- 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 b0bf3ca2..b8d94c49 100644 --- 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 b0bf3ca2..b8d94c49 100644 --- 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 b0bf3ca2..b8d94c49 100644 --- 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 b0bf3ca2..b8d94c49 100644 --- 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 b0bf3ca2..b8d94c49 100644 --- 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 b0bf3ca2..b8d94c49 100644 --- 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 b0bf3ca2..b8d94c49 100644 --- 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 b0bf3ca2..b8d94c49 100644 --- 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 b0bf3ca2..b8d94c49 100644 --- 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 b0bf3ca2..b8d94c49 100644 --- 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 b0bf3ca2..b8d94c49 100644 --- 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 fd634832..db30ce5f 100644 --- 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 d94d8e5e..5c319b36 100644 --- 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 bb27b144..70ab1624 100644 --- 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 2642bbc2..7dd0778f 100644 --- 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 83531743..9c1dbef0 100644 --- 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 ae59bc0c..ca4db5c6 100644 --- 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 e4d31604..7ec1563f 100644 --- 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 1c425ec6..0aeefed2 100644 --- 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 9d8bf682..70f6380f 100644 --- 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 1f743b27..1b015aa1 100644 --- 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 b731efe3..cc983dbd 100644 --- 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 2c11b7c9..407b05f6 100644 --- 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 ace28bbe..3647fbd4 100644 --- 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 a228699e..b8a0b1a0 100644 --- 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 f1d9b5b4..4477bf84 100644 --- 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 0eed2fe7..e038e0f7 100644 --- 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 012a3492..0b7c70d3 100644 --- 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 4cba8910..adbf691b 100644 --- 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 e5e583a2..4e1651c1 100644 --- 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 aeb5332f..2cc74023 100644 --- 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 d5a8e9f2..578847f9 100644 --- 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 867ab572..61cee9b4 100644 --- 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 e9d9d149..93ec4a27 100644 --- 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 76ebe0f8..d503098b 100644 --- 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 64f54bc1..2685e065 100644 --- 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 118cc373..988e5a81 100644 --- 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 2b1b47f2..d092ab98 100644 --- 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 d7e8c308..c4c1622b 100644 --- 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 4741d07a..886d9161 100644 --- 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 8d82cbae..61b6320f 100644 --- 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 210e5039..09d89941 100644 --- 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 9ae9c697..95eb223d 100644 --- 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 f53eef82..51387b42 100644 --- 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 4698e85a..c2ac2358 100644 --- 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 0a6c0347..adf23213 100644 --- 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 4e35231f..08dceae3 100644 --- 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 59b404f3..e197fa7c 100644 --- 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 fe162d2d..15d6b292 100644 --- 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 1c12ce4e..8517edf1 100644 --- 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 4ecdb219..518fe9ca 100644 --- 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 1dc092e2..d5d870e1 100644 --- 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 7d031f3f..3a309801 100644 --- 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 4bf31cd7..d8cf721f 100644 --- 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 7788c70f..9c427e59 100644 --- 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 7e7586f7..fb526c4a 100644 --- 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 bea6b5c7..988f355e 100644 --- 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;