From 2e7d7c1bdd7a0e22fd74b08d5bbfbae83f2945d5 Mon Sep 17 00:00:00 2001
From: Victorious3 <vic@nightfall.moe>
Date: Thu, 4 Aug 2022 16:26:00 +0200
Subject: [PATCH] Fix overloading type functions

---
 src/compiler.pr     | 4 ++--
 src/scope.pr        | 2 +-
 src/typechecking.pr | 9 +++++----
 version             | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/compiler.pr b/src/compiler.pr
index 88ded638..eb3602a2 100644
--- a/src/compiler.pr
+++ b/src/compiler.pr
@@ -6208,7 +6208,7 @@ export def create_builtin_functions {
     create_constructors()
 }
 
-export let constructors = map::make(type &string, type &typechecking::Type)
+export let constructors = map::make(type &typechecking::Type)
 def create_constructors {
     let state = toolchain::types_state
 
@@ -6318,7 +6318,7 @@ def create_constructor(copy: Value, this: Value, state: &State) {
 }
 
 // Vector of (function) Type
-export let destructors = map::make(type &string, type &typechecking::Type)
+export let destructors = map::make(type &typechecking::Type)
 def create_destructors {
     // Need to import the free function because the types module doesn't import cstd
     let state = toolchain::types_state
diff --git a/src/scope.pr b/src/scope.pr
index f23952e0..9054de32 100644
--- a/src/scope.pr
+++ b/src/scope.pr
@@ -349,7 +349,7 @@ def generate_function(scope: &Scope, node: &parser::Node, parameter_t: &Vector(t
             let name_node = parser::make_identifier(name)
             let parameter_t3 = typechecking::copy_parameter_t(found_member.parameter_t)
             let return_t = typechecking::copy_return_t(found_member.return_t)
-            let types_map = map::make(type &string, type &typechecking::Type)     // FIXME Ambiguous reference
+            let types_map = map::make(type &typechecking::Type)
 
             if stpe.tc_args {
                 for var i in 0..vector::length(stpe.tc_tpe.parameter_t) {
diff --git a/src/typechecking.pr b/src/typechecking.pr
index de7e9f53..c50f1e2d 100644
--- a/src/typechecking.pr
+++ b/src/typechecking.pr
@@ -1487,7 +1487,8 @@ export def overload_score(param_a: &Vector(NamedParameter), return_t: &Vector(&T
     return_t = copy_return_t(return_t)
 
     if vector::length(param_a) > vector::length(param_b) {
-        let not_default_param = (param_a[vector::length(param_b)]).value == null
+        let a = param_a[vector::length(param_b)]
+        let not_default_param = a.value == null or a.tpe.kind == TypeKind::TYPE
         if vector::length(param_a) == vector::length(param_b) + 1 {
             if not vector::peek(param_a).varargs and not_default_param {
                 return -1
@@ -2219,7 +2220,7 @@ export def do_type_lookup(node: &parser::Node, state: &State, current_type: &Typ
             state.scope = scpe
             return tpe
         }
-        if not cache { cache = map::make(type &string, type &Type) }
+        if not cache { cache = map::make(type &Type) }
         var cached_type = cache.get_or_default(type_name, null)
         if cached_type != null {
             state.scope = scpe
@@ -3240,7 +3241,7 @@ export def walk_Def(node: &parser::Node, state: &State) {
 
 def check_is_recursive(tpe: &Type, types: &SMap(&Type) = null) -> bool {
     if not tpe { return false }
-    if not types { types = map::make(type &string, type &Type) }
+    if not types { types = map::make(type &Type) }
     if tpe.kind == TypeKind::STATIC_ARRAY {
         return check_is_recursive(tpe.tpe, types)
     }
@@ -3250,7 +3251,7 @@ def check_is_recursive(tpe: &Type, types: &SMap(&Type) = null) -> bool {
             types[tpe.type_name] = tpe
         }
         for var i in 0..tpe.fields.size {
-            let new_types = map::make(type &string, type &Type)
+            let new_types = map::make(type &Type)
             let keys = map::keys(types)
             for var j in 0..keys.size {
                 new_types[keys[j]] = types[keys[j]]
diff --git a/version b/version
index 1e4d7783..67a4c0e6 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-VERSION=0.3.0
\ No newline at end of file
+VERSION=0.3.1
\ No newline at end of file