Update

Author: Victorious3

src/typechecking.pr

@@ -92,7 +92,7 @@ export type StructMemberPre = struct {
     properties: MemberProperties
 }
 export def copy(member: StructMemberPre) -> StructMemberPre {
-    member.tpe = member.tpe.copy() if member.tpe else null
+    member.tpe = (member.tpe.copy() if member.tpe else null)
     return member
 }
 
@@ -104,18 +104,49 @@ export type StructMember = struct {
     properties: MemberProperties
 }
 
-export type StructuralTypeMember = struct {
+export type StructuralTypeMemberPre = struct {
     name: Str
     parameter_t: &Vector(NamedParameterPre)
     return_t: &Vector(&TypeRef)
 }
 
-def make_type_member(name: Str, parameter_t: &Vector(NamedParameterPre), return_t: &Vector(&TypeRef)) -> StructuralTypeMember {
+export type StructuralTypeMember = struct {
+    name: Str
+    parameter_t: &Vector(NamedParameter)
+    return_t: &Vector(TypeId)
+}
+
+def resolve(member: StructuralTypeMemberPre, scpe: &scope::Scope) -> StructuralTypeMember {
+    var params = vector::make(NamedParameter)
+    for var param in member.parameter_t {
+        let r = resolve(param.tpe, scpe)
+        params.push([ 
+            name = param.name, 
+            tpe = r, 
+            value = param.value, 
+            kw = param.kw, 
+            varargs = param.varargs, 
+            node = param.node 
+        ] !NamedParameter)
+    }
+    var return_ids = vector::make(TypeId)
+    for var ret in member.return_t {
+        let r = resolve(ret, scpe)
+        return_ids.push(r)
+    }
+    return [
+        name = member.name,
+        parameter_t = params,
+        return_t = return_ids
+    ] !StructuralTypeMember
+}
+
+def make_type_member(name: Str, parameter_t: &Vector(NamedParameterPre), return_t: &Vector(&TypeRef)) -> StructuralTypeMemberPre {
     return [
         name = name,
         parameter_t = parameter_t,
         return_t = return_t 
-    ] !StructuralTypeMember
+    ] !StructuralTypeMemberPre
 }
 
 export type TypeId = int64
@@ -427,6 +458,7 @@ export type Pattern = struct {
     const_fields: &Vector(StructMemberPre)
     // Node for type constructor
     node: weak &parser::Node
+    members: &Vector(StructuralTypeMemberPre)
 }
 
 export def copy(pattern: &Pattern) -> &Pattern {
@@ -2007,9 +2039,8 @@ export def get_member_functions(tpe: &Type) -> &Vector(TypeEntryMember) {
 }*/
 
 export type TypeEntryMember = struct {
-    function: TypeId
+    function: FunctionDef
     exported: bool
-    module: weak &toolchain::Module
 }
 
 /*