bugfix: polymorphic argument default values did not work

diff --git a/compiler/src/polymorph.h b/compiler/src/polymorph.h
index 8fee9c845c04de40a1fefb3c3bac5bd00d086cfe..c9576c9f67db43ab892f3ca2f1b72852b85461c8 100644 (file)
--- a/compiler/src/polymorph.h
+++ b/compiler/src/polymorph.h
@@ -438,7 +438,7 @@ static AstTyped* lookup_param_in_arguments(AstFunction* func, AstPolyParam* para
         return NULL;
 
     // NOTE: This check is safe because currently the arguments given without a name
-    // always map to the beginning indidies of the argument array.
+    // always map to the beginning indicies of the argument array.
     if (param->idx >= (u64) bh_arr_length(arg_arr)) {
         OnyxToken* param_name = func->params[param->idx].local->token;
 
@@ -448,7 +448,12 @@ static AstTyped* lookup_param_in_arguments(AstFunction* func, AstPolyParam* para
             }
         }
 
-        if (param->idx <= (u64) bh_arr_length(func->params)) {
+        // This enables the following case:
+        //
+        //    f :: (x: i32, $T: type_expr = i32) -> T { ... }
+        //    f(10);
+        //
+        if (param->idx < (u64) bh_arr_length(func->params)) {
             if (func->params[param->idx].default_value) {
                 return (AstTyped *) func->params[param->idx].default_value;
             }
@@ -616,7 +621,11 @@ static void solve_for_polymorphic_param_value(PolySolveResult* resolved, AstFunc
     AstType *param_type_expr = func->params[param->idx].local->type_node;
     if (param_type_expr == (AstType *) &basic_type_type_expr) {
         if (!node_is_type((AstNode *) value)) {
-            if (err_msg) *err_msg = "Expected type expression.";
+            if (err_msg)
+                // CLEANUP: Use a different allocator.
+                *err_msg = bh_aprintf(global_heap_allocator,
+                    "Expected type expression here, got a '%s'.",
+                    type_get_name(value->type));
             return;
         }
 
@@ -629,7 +638,7 @@ static void solve_for_polymorphic_param_value(PolySolveResult* resolved, AstFunc
         resolve_expression_type(value);
 
         if ((value->flags & Ast_Flag_Comptime) == 0) {
-            if (err_msg) *err_msg = "Expected compile-time known argument.";
+            if (err_msg) *err_msg = "Expected compile-time known argument here.";
             return;
         }
 

diff --git a/compiler/src/symres.c b/compiler/src/symres.c
index ee3616202b73e6d448942391bb075cd69aedacc3..ddedd2a8ed0cb66572472e7949ab68f30bcab533 100644 (file)
--- a/compiler/src/symres.c
+++ b/compiler/src/symres.c
@@ -1367,6 +1367,17 @@ static SymresStatus symres_struct_defaults(AstType* t) {
 static SymresStatus symres_polyproc(AstFunction* pp) {
     pp->flags |= Ast_Flag_Comptime;
     pp->parent_scope_of_poly_proc = current_scope;
+
+    bh_arr_each(AstPolyParam, p, pp->poly_params) {
+        if (p->kind != PSK_Value) continue;
+
+        AstParam *param = &pp->params[p->idx];
+        if (param->default_value != NULL) {
+            SYMRES(expression, &param->default_value);
+            if (onyx_has_errors()) return Symres_Error;
+        }
+    }
+
     return Symres_Success;
 }