Merge pull request #916 from sbillig/enum-record

v2: enum record variant support; one-liner record def

Author: Y-Nak

Cargo.lock

@@ -1,3 +1,4 @@
+#![allow(clippy::arc_with_non_send_sync)]
 use crate::{
     context::{Analysis, Constant, FunctionBody},
     errors::{ConstEvalError, TypeError},

crates/analyzer/src/db.rs

@@ -564,7 +564,7 @@ pub fn module_used_item_map(
         )
         .value;
 
-        items.extend(Rc::try_unwrap(prelude_items).unwrap().into_iter());
+        items.extend(Rc::try_unwrap(prelude_items).unwrap());
     }
 
     Analysis::new(Rc::new(items), diagnostics.into())

crates/analyzer/src/db/queries/module.rs

@@ -1,3 +1,4 @@
+#![allow(clippy::arc_with_non_send_sync)]
 use std::rc::Rc;
 
 use fe_abi::{contract::AbiContract, event::AbiEvent, function::AbiFunction, types::AbiType};

crates/codegen/src/db.rs

@@ -383,7 +383,7 @@ impl RuntimeProvider for DefaultRuntimeProvider {
         }
 
         let deref_ty = ptr_ty.deref(db.upcast());
-        let args = std::iter::once(ptr).chain(args.into_iter()).collect();
+        let args = std::iter::once(ptr).chain(args).collect();
         let legalized_ty = db.codegen_legalized_type(ptr_ty);
         if deref_ty.is_enum(db.upcast()) {
             let mut name = format!("enum_init_{}", ptr_ty.0);

crates/codegen/src/yul/runtime/mod.rs

@@ -1,3 +1,4 @@
+#![allow(clippy::arc_with_non_send_sync)]
 use crate::files::{File, SourceFileId, Utf8Path};
 use codespan_reporting as cs;
 use salsa;

crates/common/src/db.rs

@@ -23,8 +23,8 @@ use crate::{
 
 use super::{
     scope_graph::{ScopeGraph, ScopeId},
-    AttrListId, Body, FuncParamListId, GenericParamListId, IdentId, IngotId, Partial, TypeId,
-    UseAlias, WhereClauseId,
+    AttrListId, Body, FuncParamListId, GenericParamListId, IdentId, IngotId, Partial, TupleTypeId,
+    TypeId, UseAlias, WhereClauseId,
 };
 
 #[derive(
@@ -687,7 +687,14 @@ pub struct VariantDefListId {
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct VariantDef {
     pub name: Partial<IdentId>,
-    pub ty: Option<TypeId>,
+    pub kind: VariantKind,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub enum VariantKind {
+    Unit,
+    Tuple(TupleTypeId),
+    Record(FieldDefListId),
 }
 
 #[salsa::interned]

crates/hir/src/hir_def/item.rs

@@ -10,7 +10,7 @@ use crate::{
 
 use super::{
     scope_graph_viz::ScopeGraphFormatter, Body, Enum, ExprId, Func, FuncParamLabel, IdentId,
-    IngotId, ItemKind, TopLevelMod, Use, Visibility,
+    IngotId, ItemKind, TopLevelMod, Use, VariantKind, Visibility,
 };
 
 /// Represents a scope relation graph in a top-level module.
@@ -82,7 +82,7 @@ pub enum ScopeId {
     FuncParam(ItemKind, usize),
 
     /// A field scope.
-    Field(ItemKind, usize),
+    Field(FieldParent, usize),
 
     /// A variant scope.
     Variant(ItemKind, usize),
@@ -97,7 +97,8 @@ impl ScopeId {
             ScopeId::Item(item) => item.top_mod(db),
             ScopeId::GenericParam(item, _) => item.top_mod(db),
             ScopeId::FuncParam(item, _) => item.top_mod(db),
-            ScopeId::Field(item, _) => item.top_mod(db),
+            ScopeId::Field(FieldParent::Item(item), _) => item.top_mod(db),
+            ScopeId::Field(FieldParent::Variant(item, _), _) => item.top_mod(db),
             ScopeId::Variant(item, _) => item.top_mod(db),
             ScopeId::Block(body, _) => body.top_mod(db),
         }
@@ -122,7 +123,8 @@ impl ScopeId {
             ScopeId::Item(item) => item,
             ScopeId::GenericParam(item, _) => item,
             ScopeId::FuncParam(item, _) => item,
-            ScopeId::Field(item, _) => item,
+            ScopeId::Field(FieldParent::Item(item), _) => item,
+            ScopeId::Field(FieldParent::Variant(item, _), _) => item,
             ScopeId::Variant(item, _) => item,
             ScopeId::Block(body, _) => body.into(),
         }
@@ -261,11 +263,18 @@ impl ScopeId {
                 enum_.variants(db).data(db)[idx].name.to_opt()
             }
 
-            ScopeId::Field(parent, idx) => match parent {
+            ScopeId::Field(FieldParent::Item(parent), idx) => match parent {
                 ItemKind::Struct(s) => s.fields(db).data(db)[idx].name.to_opt(),
                 ItemKind::Contract(c) => c.fields(db).data(db)[idx].name.to_opt(),
                 _ => unreachable!(),
             },
+            ScopeId::Field(FieldParent::Variant(parent, vidx), fidx) => {
+                let enum_: Enum = parent.try_into().unwrap();
+                match enum_.variants(db).data(db)[vidx].kind {
+                    VariantKind::Record(fields) => fields.data(db)[fidx].name.to_opt(),
+                    _ => unreachable!(),
+                }
+            }
 
             ScopeId::FuncParam(parent, idx) => {
                 let func: Func = parent.try_into().unwrap();
@@ -297,11 +306,24 @@ impl ScopeId {
                 Some(enum_.lazy_span().variants().variant(idx).name().into())
             }
 
-            ScopeId::Field(parent, idx) => match parent {
+            ScopeId::Field(FieldParent::Item(parent), idx) => match parent {
                 ItemKind::Struct(s) => Some(s.lazy_span().fields().field(idx).name().into()),
                 ItemKind::Contract(c) => Some(c.lazy_span().fields().field(idx).name().into()),
                 _ => unreachable!(),
             },
+            ScopeId::Field(FieldParent::Variant(parent, vidx), fidx) => {
+                let enum_: Enum = parent.try_into().unwrap();
+                Some(
+                    enum_
+                        .lazy_span()
+                        .variants()
+                        .variant(vidx)
+                        .fields()
+                        .field(fidx)
+                        .name()
+                        .into(),
+                )
+            }
 
             ScopeId::FuncParam(parent, idx) => {
                 let func: Func = parent.try_into().unwrap();
@@ -353,6 +375,12 @@ impl ScopeId {
     }
 }
 
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub enum FieldParent {
+    Item(ItemKind),
+    Variant(ItemKind, usize),
+}
+
 struct ScopeGraphItemIterDfs<'a> {
     db: &'a dyn HirDb,
     graph: &'a ScopeGraph,
@@ -542,7 +570,13 @@ pub struct AnonEdge();
 #[cfg(test)]
 mod tests {
 
-    use crate::{hir_def::ItemKind, test_db::TestDb};
+    use crate::{
+        hir_def::{
+            scope_graph::{FieldParent, ScopeId},
+            ItemKind,
+        },
+        test_db::TestDb,
+    };
 
     #[test]
     fn item_tree() {
@@ -555,7 +589,7 @@ mod tests {
                     fn baz()
                 }
             }
-        
+
             enum MyEnum {}
 
             mod baz {
@@ -581,4 +615,30 @@ mod tests {
             }
         }
     }
+
+    #[test]
+    fn enum_record_fields() {
+        let mut db = TestDb::default();
+
+        let text = r#"
+            enum Foo {
+                X { a: i8, b: i8 },
+            }
+        "#;
+
+        let file = db.standalone_file(text);
+        let scope_graph = db.parse_source(file);
+        let root = scope_graph.top_mod.scope();
+        let enum_ = scope_graph.children(root).next().unwrap();
+        assert!(matches!(enum_.item(), ItemKind::Enum(_)));
+
+        let variant = scope_graph.children(enum_).next().unwrap();
+        assert!(matches!(variant, ScopeId::Variant(_, _)));
+
+        let field = scope_graph.children(variant).next().unwrap();
+        assert!(matches!(
+            field,
+            ScopeId::Field(FieldParent::Variant(_, _), _)
+        ));
+    }
 }

crates/hir/src/hir_def/scope_graph.rs

@@ -13,7 +13,7 @@ pub enum TypeKind {
     Path(Partial<PathId>, GenericArgListId),
     SelfType,
     /// The `Vec` contains the types of the tuple elements.
-    Tuple(Vec<Partial<TypeId>>),
+    Tuple(TupleTypeId),
     /// The first `TypeId` is the element type, the second `Body` is the length.
     Array(Partial<TypeId>, Partial<Body>),
 }
@@ -23,3 +23,9 @@ pub struct TraitRef {
     pub path: Partial<PathId>,
     pub generic_args: GenericArgListId,
 }
+
+#[salsa::interned]
+pub struct TupleTypeId {
+    #[return_ref]
+    pub data: Vec<Partial<TypeId>>,
+}

crates/hir/src/hir_def/types.rs

@@ -47,6 +47,7 @@ pub struct Jar(
     hir_def::VariantDefListId,
     hir_def::ImplItemListId,
     hir_def::TypeId,
+    hir_def::TupleTypeId,
     hir_def::UsePathId,
     /// Accumulated diagnostics.
     ParseErrorAccumulator,