Merge pull request #251 from sinato/feat/type-aliases

feat: type alias

crates/mun_codegen/src/ir/file_group.rs

@@ -65,6 +65,7 @@ pub(crate) fn gen_file_group_ir<'db, 'ink>(
             ModuleDef::Function(_) => (), // TODO: Extern types?
             ModuleDef::Struct(_) => (),
             ModuleDef::BuiltinType(_) => (),
+            ModuleDef::TypeAlias(_) => (),
         }
     }
 
@@ -118,7 +119,7 @@ pub(crate) fn gen_file_group_ir<'db, 'ink>(
             ModuleDef::Function(f) => {
                 type_table_builder.collect_fn(*f);
             }
-            ModuleDef::BuiltinType(_) => (),
+            ModuleDef::BuiltinType(_) | ModuleDef::TypeAlias(_) => (),
         }
     }
 

crates/mun_compiler/src/diagnostics.rs

@@ -79,4 +79,19 @@ mod tests {
             "\n\nstruct Foo {\ni: bool\n}\n\nfn main() {\nlet a = Foo { i: false };\nlet b = a.t;\n}"
         ));
     }
+
+    #[test]
+    fn test_free_type_alias_error() {
+        insta::assert_display_snapshot!(compilation_errors("\n\ntype Foo;"));
+    }
+
+    #[test]
+    fn test_type_alias_target_undeclared_error() {
+        insta::assert_display_snapshot!(compilation_errors("\n\ntype Foo = UnknownType;"));
+    }
+
+    #[test]
+    fn test_cyclic_type_alias_error() {
+        insta::assert_display_snapshot!(compilation_errors("\n\ntype Foo = Foo;"));
+    }
 }

crates/mun_compiler/src/snapshots/mun_compiler__diagnostics__tests__cyclic_type_alias_error.snap

@@ -0,0 +1,10 @@
+---
+source: crates/mun_compiler/src/diagnostics.rs
+expression: "compilation_errors(\"\\n\\ntype Foo = Foo;\")"
+---
+error: cyclic type
+ --> main.mun:3:12
+  |
+3 | type Foo = Foo;
+  |            ^^^ cyclic type
+  |

crates/mun_compiler/src/snapshots/mun_compiler__diagnostics__tests__free_type_alias_error.snap

@@ -0,0 +1,10 @@
+---
+source: crates/mun_compiler/src/diagnostics.rs
+expression: "compilation_errors(\"\\n\\ntype Foo;\")"
+---
+error: free type alias without type ref
+ --> main.mun:3:1
+  |
+3 | type Foo;
+  | ^^^^^^^^^ free type alias without type ref
+  |

crates/mun_compiler/src/snapshots/mun_compiler__diagnostics__tests__type_alias_target_undeclared_error.snap

@@ -0,0 +1,10 @@
+---
+source: crates/mun_compiler/src/diagnostics.rs
+expression: "compilation_errors(\"\\n\\ntype Foo = UnknownType;\")"
+---
+error: cannot find type `UnknownType` in this scope
+ --> main.mun:3:12
+  |
+3 | type Foo = UnknownType;
+  |            ^^^^^^^^^^^ not found in this scope
+  |

crates/mun_hir/src/adt.rs

@@ -3,7 +3,7 @@ use std::{fmt, sync::Arc};
 use crate::type_ref::{TypeRefBuilder, TypeRefId, TypeRefMap, TypeRefSourceMap};
 use crate::{
     arena::{Arena, RawId},
-    ids::{AstItemDef, StructId},
+    ids::{AstItemDef, StructId, TypeAliasId},
     AsName, DefDatabase, Name,
 };
 use mun_syntax::ast::{self, NameOwner, TypeAscriptionOwner};
@@ -121,3 +121,42 @@ impl StructData {
         &self.type_ref_map
     }
 }
+
+#[derive(Debug, PartialEq, Eq)]
+pub struct TypeAliasData {
+    pub name: Name,
+    pub type_ref_id: TypeRefId,
+    type_ref_map: TypeRefMap,
+    type_ref_source_map: TypeRefSourceMap,
+}
+impl TypeAliasData {
+    pub(crate) fn type_alias_data_query(
+        db: &dyn DefDatabase,
+        id: TypeAliasId,
+    ) -> Arc<TypeAliasData> {
+        let src = id.source(db);
+        let name = src
+            .value
+            .name()
+            .map(|n| n.as_name())
+            .unwrap_or_else(Name::missing);
+        let mut type_ref_builder = TypeRefBuilder::default();
+        let type_ref_opt = src.value.type_ref();
+        let type_ref_id = type_ref_builder.alloc_from_node_opt(type_ref_opt.as_ref());
+        let (type_ref_map, type_ref_source_map) = type_ref_builder.finish();
+        Arc::new(TypeAliasData {
+            name,
+            type_ref_id,
+            type_ref_map,
+            type_ref_source_map,
+        })
+    }
+
+    pub fn type_ref_source_map(&self) -> &TypeRefSourceMap {
+        &self.type_ref_source_map
+    }
+
+    pub fn type_ref_map(&self) -> &TypeRefMap {
+        &self.type_ref_map
+    }
+}

crates/mun_hir/src/code_model.rs

@@ -1,11 +1,11 @@
 pub(crate) mod src;
 
 use self::src::HasSource;
-use crate::adt::{StructData, StructFieldId};
+use crate::adt::{StructData, StructFieldId, TypeAliasData};
 use crate::builtin_type::BuiltinType;
 use crate::code_model::diagnostics::ModuleDefinitionDiagnostic;
 use crate::diagnostics::DiagnosticSink;
-use crate::expr::validator::ExprValidator;
+use crate::expr::validator::{ExprValidator, TypeAliasValidator};
 use crate::expr::{Body, BodySourceMap};
 use crate::ids::AstItemDef;
 use crate::ids::LocationCtx;
@@ -15,7 +15,7 @@ use crate::resolve::{Resolution, Resolver};
 use crate::ty::{lower::LowerBatchResult, InferenceResult};
 use crate::type_ref::{TypeRefBuilder, TypeRefId, TypeRefMap, TypeRefSourceMap};
 use crate::{
-    ids::{FunctionId, StructId},
+    ids::{FunctionId, StructId, TypeAliasId},
     AsName, DefDatabase, FileId, HirDatabase, Name, Ty,
 };
 use mun_syntax::ast::{ExternOwner, NameOwner, TypeAscriptionOwner, VisibilityOwner};
@@ -52,11 +52,11 @@ impl Module {
             diag.add_to(db.upcast(), self, sink);
         }
         for decl in self.declarations(db) {
-            #[allow(clippy::single_match)]
             match decl {
                 ModuleDef::Function(f) => f.diagnostics(db, sink),
                 ModuleDef::Struct(s) => s.diagnostics(db, sink),
-                _ => (),
+                ModuleDef::TypeAlias(t) => t.diagnostics(db, sink),
+                ModuleDef::BuiltinType(_) => (),
             }
         }
     }
@@ -104,6 +104,11 @@ impl ModuleData {
                                 id: StructId::from_ast_id(loc_ctx, ast_id),
                             }))
                         }
+                        DefKind::TypeAlias(ast_id) => {
+                            data.definitions.push(ModuleDef::TypeAlias(TypeAlias {
+                                id: TypeAliasId::from_ast_id(loc_ctx, ast_id),
+                            }))
+                        }
                     }
                 }
             };
@@ -121,6 +126,7 @@ pub enum ModuleDef {
     Function(Function),
     BuiltinType(BuiltinType),
     Struct(Struct),
+    TypeAlias(TypeAlias),
 }
 
 impl From<Function> for ModuleDef {
@@ -328,7 +334,8 @@ impl Function {
     }
 
     pub fn ty(self, db: &dyn HirDatabase) -> Ty {
-        db.type_for_def(self.into(), Namespace::Values)
+        // TODO: Add detection of cyclick types
+        db.type_for_def(self.into(), Namespace::Values).0
     }
 
     pub fn infer(self, db: &dyn HirDatabase) -> Arc<InferenceResult> {
@@ -418,7 +425,8 @@ impl Struct {
     }
 
     pub fn ty(self, db: &dyn HirDatabase) -> Ty {
-        db.type_for_def(self.into(), Namespace::Types)
+        // TODO: Add detection of cyclick types
+        db.type_for_def(self.into(), Namespace::Types).0
     }
 
     pub fn lower(self, db: &dyn HirDatabase) -> Arc<LowerBatchResult> {
@@ -442,6 +450,54 @@ impl Struct {
     }
 }
 
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct TypeAlias {
+    pub(crate) id: TypeAliasId,
+}
+
+impl TypeAlias {
+    pub fn module(self, db: &dyn DefDatabase) -> Module {
+        Module {
+            file_id: self.id.file_id(db),
+        }
+    }
+
+    pub fn data(self, db: &dyn DefDatabase) -> Arc<TypeAliasData> {
+        db.type_alias_data(self.id)
+    }
+
+    pub fn name(self, db: &dyn DefDatabase) -> Name {
+        self.data(db).name.clone()
+    }
+
+    pub fn type_ref(self, db: &dyn HirDatabase) -> TypeRefId {
+        self.data(db.upcast()).type_ref_id
+    }
+
+    pub fn lower(self, db: &dyn HirDatabase) -> Arc<LowerBatchResult> {
+        db.lower_type_alias(self)
+    }
+
+    pub(crate) fn resolver(self, db: &dyn HirDatabase) -> Resolver {
+        // take the outer scope...
+        self.module(db.upcast()).resolver(db.upcast())
+    }
+
+    pub fn diagnostics(self, db: &dyn HirDatabase, sink: &mut DiagnosticSink) {
+        let data = self.data(db.upcast());
+        let lower = self.lower(db);
+        lower.add_diagnostics(
+            db,
+            self.module(db.upcast()).file_id,
+            data.type_ref_source_map(),
+            sink,
+        );
+
+        let validator = TypeAliasValidator::new(self, db);
+        validator.validate_target_type_existence(sink);
+    }
+}
+
 mod diagnostics {
     use super::Module;
     use crate::diagnostics::{DiagnosticSink, DuplicateDefinition};
@@ -466,6 +522,9 @@ mod diagnostics {
             DefKind::Struct(id) => {
                 SyntaxNodePtr::new(id.with_file_id(owner.file_id).to_node(db).syntax())
             }
+            DefKind::TypeAlias(id) => {
+                SyntaxNodePtr::new(id.with_file_id(owner.file_id).to_node(db).syntax())
+            }
         }
     }
 

crates/mun_hir/src/code_model/src.rs

@@ -1,4 +1,4 @@
-use crate::code_model::{Function, Struct, StructField};
+use crate::code_model::{Function, Struct, StructField, TypeAlias};
 use crate::ids::AstItemDef;
 use crate::in_file::InFile;
 use crate::DefDatabase;
@@ -45,3 +45,10 @@ impl HasSource for StructField {
         InFile::new(file_id, ast)
     }
 }
+
+impl HasSource for TypeAlias {
+    type Ast = ast::TypeAliasDef;
+    fn source(self, db: &dyn DefDatabase) -> InFile<ast::TypeAliasDef> {
+        self.id.source(db)
+    }
+}

crates/mun_hir/src/db.rs

@@ -5,13 +5,13 @@ use crate::name_resolution::Namespace;
 use crate::ty::lower::LowerBatchResult;
 use crate::ty::{CallableDef, FnSig, Ty, TypableDef};
 use crate::{
-    adt::StructData,
+    adt::{StructData, TypeAliasData},
     code_model::{DefWithBody, FnData, Function, ModuleData},
     ids,
     line_index::LineIndex,
     name_resolution::ModuleScope,
     ty::InferenceResult,
-    AstIdMap, ExprScopes, FileId, RawItems, Struct,
+    AstIdMap, ExprScopes, FileId, RawItems, Struct, TypeAlias,
 };
 use mun_syntax::{ast, Parse, SourceFile};
 use mun_target::abi;
@@ -66,6 +66,9 @@ pub trait DefDatabase: SourceDatabase + Upcast<dyn SourceDatabase> {
     #[salsa::invoke(StructData::struct_data_query)]
     fn struct_data(&self, id: ids::StructId) -> Arc<StructData>;
 
+    #[salsa::invoke(TypeAliasData::type_alias_data_query)]
+    fn type_alias_data(&self, id: ids::TypeAliasId) -> Arc<TypeAliasData>;
+
     #[salsa::invoke(crate::FnData::fn_data_query)]
     fn fn_data(&self, func: Function) -> Arc<FnData>;
 
@@ -80,6 +83,10 @@ pub trait DefDatabase: SourceDatabase + Upcast<dyn SourceDatabase> {
     /// Interns a struct definition
     #[salsa::interned]
     fn intern_struct(&self, loc: ids::ItemLoc<ast::StructDef>) -> ids::StructId;
+
+    /// Interns a type alias definition
+    #[salsa::interned]
+    fn intern_type_alias(&self, loc: ids::ItemLoc<ast::TypeAliasDef>) -> ids::TypeAliasId;
 }
 
 #[salsa::query_group(HirDatabaseStorage)]
@@ -104,11 +111,15 @@ pub trait HirDatabase: DefDatabase + Upcast<dyn DefDatabase> {
     #[salsa::invoke(crate::ty::lower::lower_struct_query)]
     fn lower_struct(&self, def: Struct) -> Arc<LowerBatchResult>;
 
+    #[salsa::invoke(crate::ty::lower::lower_type_alias_query)]
+    fn lower_type_alias(&self, def: TypeAlias) -> Arc<LowerBatchResult>;
+
     #[salsa::invoke(crate::ty::callable_item_sig)]
     fn callable_sig(&self, def: CallableDef) -> FnSig;
 
     #[salsa::invoke(crate::ty::type_for_def)]
-    fn type_for_def(&self, def: TypableDef, ns: Namespace) -> Ty;
+    #[salsa::cycle(crate::ty::type_for_cycle_recover)]
+    fn type_for_def(&self, def: TypableDef, ns: Namespace) -> (Ty, bool);
 
     #[salsa::invoke(crate::expr::body_hir_query)]
     fn body(&self, def: DefWithBody) -> Arc<crate::expr::Body>;

crates/mun_hir/src/diagnostics.rs

@@ -117,6 +117,26 @@ impl Diagnostic for UnresolvedType {
     }
 }
 
+#[derive(Debug)]
+pub struct CyclicType {
+    pub file: FileId,
+    pub type_ref: AstPtr<ast::TypeRef>,
+}
+
+impl Diagnostic for CyclicType {
+    fn message(&self) -> String {
+        "cyclic type".to_string()
+    }
+
+    fn source(&self) -> InFile<SyntaxNodePtr> {
+        InFile::new(self.file, self.type_ref.syntax_node_ptr())
+    }
+
+    fn as_any(&self) -> &(dyn Any + Send + 'static) {
+        self
+    }
+}
+
 #[derive(Debug)]
 pub struct ExpectedFunction {
     pub file: FileId,
@@ -687,3 +707,22 @@ impl Diagnostic for InvalidLiteral {
         self
     }
 }
+
+#[derive(Debug)]
+pub struct FreeTypeAliasWithoutTypeRef {
+    pub type_alias_def: InFile<SyntaxNodePtr>,
+}
+
+impl Diagnostic for FreeTypeAliasWithoutTypeRef {
+    fn message(&self) -> String {
+        "free type alias without type ref".to_string()
+    }
+
+    fn source(&self) -> InFile<SyntaxNodePtr> {
+        self.type_alias_def
+    }
+
+    fn as_any(&self) -> &(dyn Any + Send + 'static) {
+        self
+    }
+}