sema: fix generic type alias eval

julelang · Mar 13, 2024 · ab9c72a · ab9c72a
1 parent 1eb6d8d
commit ab9c72a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/std/jule/sema/eval.jule b/std/jule/sema/eval.jule
@@ -690,23 +690,24 @@ impl Eval {
         ta.used = true
 
         let mut kind = ta.kind.kind.kind
+        let mut d: &Data = nil
         match type kind {
         | &StructIns:
-            ret self.__eval_struct((&StructIns)(kind))
+            d = self.__eval_struct((&StructIns)(kind))
         | &Enum:
-            ret self.__eval_enum((&Enum)(kind))
+            d = self.__eval_enum((&Enum)(kind))
         |:
-            let mut d = &Data{
+            d = &Data{
                 decl: true,
                 kind: &TypeKind{
-                    generic:   ta.generic,
                     cpp_ident: if ta.cpp_linked { ta.ident } else { ta.kind.kind.cpp_ident },
                     kind:      ta.kind.kind.kind,
                 },
             }
             d.model = d.kind
-            ret d
         }
+        d.kind.generic = ta.generic
+        ret d
     }
 
     fn eval_def(mut self, mut def: any, ident: Token): &Data {

diff --git a/std/jule/sema/scope.jule b/std/jule/sema/scope.jule
@@ -1457,7 +1457,7 @@ impl ScopeChecker {
             let mut d = eval.eval_expr_kind(e.kind)
             if d == nil {
                 continue
-            } 
+            }
             if m.type_match {
                 _case.exprs = append(_case.exprs, d)
                 if count_match_type(m, d.kind) > 1 {

diff --git a/std/jule/sema/sema.jule b/std/jule/sema/sema.jule
@@ -179,7 +179,9 @@ fn build_generic_type_aliases(mut &f: &FnIns): []&TypeAlias {
             scope:   f.decl.scope,
             ident:   decl.ident,
             token:   decl.token,
-            kind:    &TypeSymbol{kind: g},
+            kind:    &TypeSymbol{
+                kind: g,
+            },
         })
     }
 
@@ -193,7 +195,9 @@ fn build_generic_type_aliases(mut &f: &FnIns): []&TypeAlias {
                 scope:   f.decl.scope,
                 ident:   decl.ident,
                 token:   decl.token,
-                kind:    &TypeSymbol{kind: g},
+                kind:    &TypeSymbol{
+                    kind: g,
+                },
             })
         }
     }