Algorithm-EQ
diff --git a/‎crates/analyzer/src/db/queries/contracts.rs‎
Lines changed: 0 additions & 7 deletions b/‎crates/analyzer/src/db/queries/contracts.rs‎
Lines changed: 0 additions & 7 deletions
diff --git a/‎crates/analyzer/src/namespace/items.rs‎
Lines changed: 7 additions & 0 deletions b/‎crates/analyzer/src/namespace/items.rs‎
Lines changed: 7 additions & 0 deletions
@@ -346,13 +346,6 @@ pub fn contract_field_type(
         scope.not_yet_implemented("contract field initial value assignment", value_node.span);
     }
 
-    if matches!(typ, Ok(Type::Struct(Struct { id, .. })) if id.has_complex_fields(db)) {
-        scope.not_yet_implemented(
-            "structs in storage aren't yet allowed to contain fields with complex types",
-            node.span,
-        );
-    }
-
     Analysis {
         value: typ,
         diagnostics: Rc::new(scope.diagnostics),
 
@@ -1342,6 +1342,10 @@ impl StructId {
         matches!(self.field_type(db, name), Some(Ok(FixedSize::Base(_))))
     }
 
+    pub fn field_index(&self, db: &dyn AnalyzerDb, name: &str) -> Option<usize> {
+        self.fields(db).get_index_of(name)
+    }
+
     pub fn has_complex_fields(&self, db: &dyn AnalyzerDb) -> bool {
         self.fields(db)
             .iter()
@@ -1414,6 +1418,9 @@ impl StructFieldId {
     pub fn typ(&self, db: &dyn AnalyzerDb) -> Result<types::FixedSize, TypeError> {
         db.struct_field_type(*self).value
     }
+    pub fn is_base_type(&self, db: &dyn AnalyzerDb) -> bool {
+        matches!(self.typ(db), Ok(FixedSize::Base(_)))
+    }
     pub fn is_public(&self, db: &dyn AnalyzerDb) -> bool {
         self.data(db).ast.kind.is_pub
     }
Original file line number	Diff line number	Diff line change
`@@ -1342,6 +1342,10 @@ impl StructId {`
`1342`	`1342`	`matches!(self.field_type(db, name), Some(Ok(FixedSize::Base(_))))`
`1343`	`1343`	`}`
`1344`	`1344`
	`1345`	`+ pub fn field_index(&self, db: &dyn AnalyzerDb, name: &str) -> Option<usize> {`
	`1346`	`+ self.fields(db).get_index_of(name)`
	`1347`	`+ }`
	`1348`	`+`
`1345`	`1349`	`pub fn has_complex_fields(&self, db: &dyn AnalyzerDb) -> bool {`
`1346`	`1350`	`self.fields(db)`
`1347`	`1351`	`.iter()`
`@@ -1414,6 +1418,9 @@ impl StructFieldId {`
`1414`	`1418`	`pub fn typ(&self, db: &dyn AnalyzerDb) -> Result<types::FixedSize, TypeError> {`
`1415`	`1419`	`db.struct_field_type(*self).value`
`1416`	`1420`	`}`
	`1421`	`+ pub fn is_base_type(&self, db: &dyn AnalyzerDb) -> bool {`
	`1422`	`+ matches!(self.typ(db), Ok(FixedSize::Base(_)))`
	`1423`	`+ }`
`1417`	`1424`	`pub fn is_public(&self, db: &dyn AnalyzerDb) -> bool {`
`1418`	`1425`	`self.data(db).ast.kind.is_pub`
`1419`	`1426`	`}`