Merge branch 'master' into fix/array-insert

Author: brendanfh

compiler/cli/error_printing.h

@@ -194,3 +194,14 @@ void onyx_errors_print(onyx_context_t *ctx, char *error_format, b32 colored_prin
     if (error_format_json) bh_printf("]");
 }
 
+b32 onyx_errors_present(onyx_context_t *ctx) {
+    fori (i, 0, onyx_error_count(ctx)) {
+        onyx_error_details_t err;
+        if (onyx_error_rank(ctx, i) >= ONYX_ERROR_WAITING) {
+            return 1;
+        }
+    }
+
+    return 0;
+}
+

compiler/cli/main.c

@@ -945,8 +945,8 @@ int main(int argc, char *argv[]) {
 
     u64 duration = bh_time_duration(start_time);
 
-    if (onyx_error_count(ctx) > 0) {
-        onyx_errors_print(ctx, cli_args.error_format, !cli_args.no_colors, cli_args.show_all_errors);
+    onyx_errors_print(ctx, cli_args.error_format, !cli_args.no_colors, cli_args.show_all_errors);
+    if (onyx_errors_present(ctx)) {
         return 1;
     }
 

compiler/src/library_main.c

@@ -487,7 +487,7 @@ onyx_pump_t onyx_pump(onyx_context_t *ctx) {
     // cycle detection algorithm must be used.
     //
     if (!changed) {
-        if (!context->watermarked_node) {
+        if (!context->watermarked_node || context->watermarked_node->macro_attempts < ent->macro_attempts) {
             context->watermarked_node = ent;
             context->highest_watermark = bh_max(context->highest_watermark, ent->macro_attempts);
         }
@@ -506,10 +506,6 @@ onyx_pump_t onyx_pump(onyx_context_t *ctx) {
                 context->cycle_almost_detected += 1;
             }
         }
-        else if (context->watermarked_node->macro_attempts < ent->macro_attempts) {
-            context->watermarked_node = ent;
-            context->highest_watermark = bh_max(context->highest_watermark, ent->macro_attempts);
-        }
     } else {
         context->watermarked_node = NULL;
         context->cycle_almost_detected = 0;

compiler/src/parser.c

@@ -2143,6 +2143,15 @@ static AstNode* parse_statement(OnyxParser* parser) {
                 break;
             }
 
+            if (parse_possible_directive(parser, "error")) {
+                AstDirectiveError *error = make_node(AstDirectiveError, Ast_Kind_Directive_Error);
+                error->token = parser->curr - 2;
+                error->error_msg = expect_token(parser, Token_Type_Literal_String);
+
+                ENTITY_SUBMIT(error);
+                break;
+            }
+
             if (next_tokens_are(parser, 2, '#', Token_Type_Symbol)) {
                 retval = (AstNode *) parse_factor(parser);
                 break;

core/container/array.onyx

@@ -165,12 +165,12 @@ Array.insert :: (arr: &[..] $T, idx: u32, x: T) -> bool {
     if idx > arr.count do return false;
     if !Array.ensure_capacity(arr, arr.count + 1) do return false;
 
-    arr.count += 1;
-    while i := arr.count - 1; i > idx {
+    while i := arr.count; i > idx {
         arr.data[i] = arr.data[i - 1];
         i -= 1;
     }
 
+    arr.count += 1;
     arr.data[idx] = x;
     return true;
 }

core/container/iter.onyx

@@ -52,6 +52,9 @@ Iterator.generator_no_copy :: generator_no_copy
 Iterator.comp :: comp
 Iterator.prod :: prod
 
+Iterator.single :: single
+Iterator.const  :: const
+
 
 
 /// The standard function to convert something to an Iterator.

core/container/set.onyx

@@ -36,6 +36,17 @@ Set.make :: ($T: type_expr, allocator := context.allocator) -> Set(T) {
     return set;
 }
 
+Set.from :: (arr: [] $T, allocator := context.allocator) -> Set(T) {
+    set : Set(T)
+    Set.init(&set, allocator=allocator)
+
+    for a in arr {
+        Set.insert(&set, a)
+    }
+
+    return set
+}
+
 #overload
 builtin.__make_overload :: macro (x: &Set, allocator: Allocator) =>
     #this_package.Set.make(x.Elem_Type, allocator = allocator);