Use HIR type table for fresh constructors

Author: olwang

src/ast.rs

@@ -9,13 +9,6 @@ pub enum FileMode {
     UsesLocal,
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum TypeKind {
-    Class,
-    Struct,
-    Resource,
-}
-
 #[derive(Debug, Clone)]
 pub struct FieldDecl {
     pub type_name: String,
@@ -25,7 +18,6 @@ pub struct FieldDecl {
 #[derive(Debug, Clone)]
 pub struct TypeDecl {
     pub name: String,
-    pub kind: TypeKind,
     pub fields: Vec<FieldDecl>,
 }
 
@@ -103,13 +95,6 @@ impl Parser<'_> {
     }
 
     fn parse_type_decl(&mut self) {
-        let kind = if self.at_ident("class") {
-            TypeKind::Class
-        } else if self.at_ident("struct") {
-            TypeKind::Struct
-        } else {
-            TypeKind::Resource
-        };
         self.index += 1;
         let Some(name) = self.take_ident_name() else {
             return;
@@ -154,7 +139,7 @@ impl Parser<'_> {
         }
         self.program
             .types
-            .insert(name.clone(), TypeDecl { name, kind, fields });
+            .insert(name.clone(), TypeDecl { name, fields });
         self.index = body_end + 1;
     }
 

src/checks/body.rs

@@ -682,11 +682,7 @@ fn check_fresh_return(
             }
         }
         Expr::Ident(name, span)
-            if !analyzer
-                .program
-                .types
-                .get(name)
-                .is_some_and(|decl| decl.kind == crate::ast::TypeKind::Struct)
+            if !is_struct_type(analyzer, name)
                 && !analyzer
                     .hir
                     .resolve_function(None, name)
@@ -707,11 +703,7 @@ fn check_fresh_return(
         }
         Expr::Call { callee, span, .. } => {
             let constructor_is_struct = match callee {
-                Callee::Name(name) => analyzer
-                    .program
-                    .types
-                    .get(name)
-                    .is_some_and(|decl| decl.kind == crate::ast::TypeKind::Struct),
+                Callee::Name(name) => is_struct_type(analyzer, name),
                 Callee::Qualified { .. } => false,
             };
             let call_returns_fresh = analyzer
@@ -779,6 +771,10 @@ fn fresh_return_diagnostic(
     );
 }
 
+fn is_struct_type(analyzer: &Analyzer<'_>, name: &str) -> bool {
+    analyzer.hir.type_kind(name) == Some(crate::hir::HirTypeKind::Struct)
+}
+
 fn infer_expr_type(analyzer: &Analyzer<'_>, expr: &Expr, state: &BodyState) -> Option<String> {
     match expr {
         Expr::Ident(name, _) => state.value_types.get(name).cloned(),