Merge pull request #158 from onyx-lang/rc-0.1.13

Release 0.1.13

Author: brendanfh

CHANGELOG

@@ -8,6 +8,7 @@ Additions:
 - "Field update" syntax. A shorthand to change a field of a structure.
     - `.{ ..old_value, field = new_value }`
 - `onyx watch` now works on MacOS.
+- `onyx run-watch` to automatically re-run the program on changes.
 - `#wasm_section` directive to add custom sections to the WASM binary.
 - Custom commands per project
     - Installed in a `.onyx` directory
@@ -30,13 +31,18 @@ Additions:
 Removals:
 
 Changes:
+- Capture/closure syntax is now `(params) use (captures) ...`.
+    - `(x: i32) use (variable) -> str { ... }`
+    - `(x) use (variable) => { ... }`
 - `&&` and `||` now short-circuit.
+- Fixed-sized arrays (`[N] T`) are now passed by value.
 - The size of tag field for unions is now dependent on the number of variants.
 - Parsing structs no longer sometimes needs `#type`.
 - Renamed `core.alloc.memdebug` to `core.alloc.memwatch`.
 
 Bugfixes:
 - Bug when injecting into a `#distinct` type.
+- Many, many random bugs.
 
 
 

README.md

@@ -37,18 +37,20 @@ use core {*}
 Person :: struct { age: i32; name: str }
 
 main :: () {
-    // Generate a list of random people
-    people := iter.comp(0 .. 30, [](Person.{
-        random.between(1, 10)
-        random.string(10, alpha_numeric=true)
-    }))
+    // Generate a list of 30 random people
+    people := Iterator.from(0 .. 30)
+        |> Iterator.map(_ => Person.{
+            random.between(1, 10)
+            random.string(10, alpha_numeric=true)
+        })
+        |> Iterator.collect()
 
     // Sort them by age
-    people->sort((a, b) => a.age - b.age)
+    Slice.sort(people, (a, b) => a.age - b.age)
 
     // Group them by age
-    group_iter := iter.as_iter(people)
-        |> iter.group_by((a, b) => a.age == b.age)
+    group_iter := Iterator.from(people)
+        |> Iterator.group_by((a, b) => a.age == b.age)
 
     // Print the groups of people
     for group in group_iter {

compiler/include/astnodes.h

@@ -3,7 +3,7 @@
 
 #define VERSION_MAJOR 0
 #define VERSION_MINOR 1
-#define VERSION_PATCH 12
+#define VERSION_PATCH 13
 
 #include "stb_ds.h"
 #include "lex.h"
@@ -2000,7 +2000,7 @@ struct CompileOptions {
 
     Runtime runtime;
 
-    bh_arr(const char *) included_folders;
+    bh_arr(bh_mapped_folder) mapped_folders;
     bh_arr(const char *) files;
     const char* target_file;
     const char* documentation_file;

compiler/include/wasm_emit.h

@@ -791,6 +791,11 @@ typedef struct OnyxWasmModule {
     CallingConvention curr_cc;
     i32 null_proc_func_idx;
 
+    i32 global_type_table_data_id;
+    i32 type_info_size;
+    i32 *type_info_entry_count;
+    bh_arr(i32) types_enqueued_for_info;
+
     b32 has_stack_locals : 1;
     b32 doing_linking : 1;
 

compiler/src/checker.c

@@ -1783,6 +1783,50 @@ CheckStatus check_struct_literal(AstStructLiteral* sl) {
         return Check_Success;
     }
 
+    if (sl->type->kind == Type_Kind_Array) {
+        if (bh_arr_length(sl->args.named_values) > 0) {
+            ERROR_(sl->token->pos, "Cannot specify named values when creating a '%s'.", type_get_name(sl->type));
+        }
+
+        i32 value_count = bh_arr_length(sl->args.values);
+        if (value_count == 0) {
+            AstZeroValue *zv = make_zero_value(context.ast_alloc, sl->token, sl->type);
+            bh_arr_push(sl->values_to_initialize, ((ValueWithOffset) { (AstTyped *) zv, 0 }));
+
+            sl->flags |= Ast_Flag_Has_Been_Checked;
+            return Check_Success;
+        }
+
+        if (value_count != sl->type->Array.count) {
+            ERROR_(sl->token->pos,
+                    "Expected exactly '%d' values when constructing a '%s', but got '%d' value%s.",
+                    sl->type->Array.count,
+                    type_get_name(sl->type),
+                    value_count,
+                    bh_num_plural(value_count));
+        }
+
+        Type* type_to_match = sl->type->Array.elem;
+        i32 offset = 0;
+        bh_arr_each(AstTyped *, pval, sl->args.values) {
+            CHECK(expression, pval);
+
+            TYPE_CHECK(pval, type_to_match) {
+                ERROR_(sl->token->pos,
+                       "Mismatched type. Expected something of type '%s', got '%s'.",
+                       type_get_name(type_to_match),
+                       type_get_name((*pval)->type));
+            }
+
+            bh_arr_push(sl->values_to_initialize, ((ValueWithOffset) { *pval, offset }));
+            offset += type_size_of(type_to_match);
+            bh_align(offset, type_alignment_of(type_to_match));
+        }
+
+        return Check_Success;
+    }
+
+
     if (!type_is_structlike_strict(sl->type)) {
         if ((sl->flags & Ast_Flag_Has_Been_Checked) != 0) return Check_Success;
 
@@ -3545,6 +3589,13 @@ CheckStatus check_function_header(AstFunction* func) {
         if (local->type->kind != Type_Kind_Array && type_size_of(local->type) == 0) {
             ERROR(local->token->pos, "Function parameters cannot have 'void' as their type.");
         }
+
+        if (local->type->kind == Type_Kind_Array && type_size_of(local->type) >= 128) {
+            onyx_report_warning(local->token->pos, "Since arrays are passed by value, this array parameter would copy %d bytes per function call. Unless this is what you want, you should make this parameter a slice instead ('[] %s').",
+                type_size_of(local->type),
+                type_get_name(local->type->Array.elem)
+            );
+        }
     }
 
     if (func->return_type != NULL) CHECK(type, &func->return_type);
@@ -3913,7 +3964,7 @@ CheckStatus check_process_directive(AstNode* directive) {
 
             char *path = bh_strdup(
                 global_scratch_allocator,
-                bh_lookup_file(temp_str, parent_folder, "", 0, NULL, 0)
+                bh_lookup_file(temp_str, parent_folder, NULL, NULL, NULL)
             );
 
             if (!bh_file_exists(path)) {

compiler/src/cli.c

@@ -71,7 +71,7 @@ static const char *build_docstring = DOCSTRING_HEADER
     C_BOLD "Flags:\n" C_NORM
     C_LBLUE "    -o, --output " C_GREY "target_file    " C_NORM "Specify the target file " C_GREY "(default: out.wasm)\n"
     C_LBLUE "    -r, --runtime " C_GREY "runtime       " C_NORM "Specifies the runtime " C_GREY "(onyx, wasi, js, custom)\n"
-    C_LBLUE "    -I, --include " C_GREY "dir           " C_NORM "Include a directory in the search path\n"
+    C_LBLUE "    --map-dir " C_GREY "name:folder       " C_NORM "Adds a mapped directory\n"
     "\n"
     C_LBLUE "    --debug                     " C_NORM "Output a debugable build\n"
     C_LBLUE "    --feature " C_GREY "feature           " C_NORM "Enable an experimental language feature\n"
@@ -331,7 +331,24 @@ static void cli_parse_compilation_options(CompileOptions *options, int arg_parse
             }
         }
         else if (!strcmp(argv[i], "-I") || !strcmp(argv[i], "--include")) {
-            bh_arr_push(options->included_folders, argv[++i]);
+            OnyxFilePos fp = {0};
+            onyx_report_warning(fp, "%s has been removed in favor of --map-dir", argv[i++]);
+        }
+        else if (!strcmp(argv[i], "--map-dir")) {
+            char *arg = argv[++i];
+            int len = strnlen(arg, 256);
+
+            char *name = arg;
+            char *folder = NULL;
+            fori (i, 0, len) if (arg[i] == ':') {
+                arg[i] = '\0';
+                folder = &arg[i + 1];
+            }
+
+            bh_mapped_folder mf;
+            mf.name = name;
+            mf.folder = folder;
+            bh_arr_push(options->mapped_folders, mf);
         }
         else if (!strncmp(argv[i], "-D", 2)) {
             i32 len = strlen(argv[i]);
@@ -488,7 +505,7 @@ static CompileOptions compile_opts_parse(bh_allocator alloc, int argc, char *arg
     };
 
     bh_arr_new(alloc, options.files, 2);
-    bh_arr_new(alloc, options.included_folders, 2);
+    bh_arr_new(alloc, options.mapped_folders, 2);
     bh_arr_new(alloc, options.defined_variables, 2);
 
     #if defined(_BH_LINUX) || defined(_BH_DARWIN)
@@ -516,9 +533,10 @@ static CompileOptions compile_opts_parse(bh_allocator alloc, int argc, char *arg
         exit(1);
     }
 
-    // NOTE: Add the current folder
-    bh_arr_push(options.included_folders, options.core_installation);
-    bh_arr_push(options.included_folders, ".");
+    bh_arr_push(options.mapped_folders, ((bh_mapped_folder) {
+        .name = "core",
+        .folder = bh_aprintf(alloc, "%s/core", options.core_installation)
+    }));
 
     if (argc == 1) return options;
 
@@ -577,7 +595,7 @@ static CompileOptions compile_opts_parse(bh_allocator alloc, int argc, char *arg
 
 static void compile_opts_free(CompileOptions* opts) {
     bh_arr_free(opts->files);
-    bh_arr_free(opts->included_folders);
+    bh_arr_free(opts->mapped_folders);
 }
 
 static void print_subcommand_help(const char *subcommand) {

compiler/src/extensions.c

@@ -88,7 +88,7 @@ static b32 extension_spawn(CompilerExtension *ext, const char *path) {
             dup2(comp_to_ext[0], 0);
             dup2(ext_to_comp[1], 1);
 
-            execlp("onyx", "onyx", "run", path, NULL);
+            execlp("onyx", "onyx", "run", "--no-compiler-extensions", "--no-file-contents", path, NULL);
             exit(1);
             break;
 
@@ -191,10 +191,9 @@ TypeMatch compiler_extension_start(const char *name, const char *containing_file
     if (*out_extension_id == 0) {
         char* parent_folder = bh_path_get_parent(containing_filename, global_scratch_allocator);
 
-        // CLEANUP: Should the include folders be different than the other include files list?
         char *path = bh_strdup(
                 global_scratch_allocator,
-                bh_lookup_file((char *) name, parent_folder, ".wasm", 0, context.options->included_folders, 0)
+                bh_lookup_file((char *) name, parent_folder, NULL, NULL, NULL)
         );
 
         if (!bh_file_exists(path)) {