move check to checker

Delta456 · Jul 16, 2024 · 7007313 · 7007313
1 parent 5e2bb55
commit 7007313
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/vlib/v/checker/checker.v b/vlib/v/checker/checker.v
@@ -568,6 +568,15 @@ fn (mut c Checker) alias_type_decl(node ast.AliasTypeDecl) {
 							node.type_pos)
 					}
 				}
+				if parent_typ_sym.info.is_anon {
+					// Disallow cases like `type Alias = struct { Int Int }` where Int is `type Int = int`
+					for field in parent_typ_sym.info.fields {
+						if field.name != '' && field.anon_struct_decl.fields.len == 0
+							&& field.anon_struct_decl.name == '' {
+							c.error('invalid anonymous struct', node.type_pos)
+						}
+					}
+				}
 			}
 		}
 		.array {

diff --git a/vlib/v/checker/tests/type_alias_decl_anon_struct_invalid_embed.out b/vlib/v/checker/tests/type_alias_decl_anon_struct_invalid_embed.out
@@ -4,3 +4,9 @@ vlib/v/checker/tests/type_alias_decl_anon_struct_invalid_embed.vv:2:16: error: c
       |                ~~~~~~~~
     3 |     Int
     4 | }
+vlib/v/checker/tests/type_alias_decl_anon_struct_invalid_embed.vv:2:16: error: invalid anonymous struct
+    1 | type Int = int
+    2 | type MyIndex = struct {
+      |                ~~~~~~~~
+    3 |     Int
+    4 | }
diff --git a/vlib/v/parser/struct.v b/vlib/v/parser/struct.v
@@ -239,10 +239,6 @@ fn (mut p Parser) struct_decl(is_anon bool) ast.StructDecl {
 					typ = p.table.find_type_idx(p.anon_struct_decl.name)
 				} else {
 					start_type_pos := p.tok.pos()
-					if field_name == p.tok.lit && p.tok.lit[0].is_capital() {
-						p.error('field-name `${p.tok.lit}` cannot be same as the type-name')
-						return ast.StructDecl{}
-					}
 					typ = p.parse_type()
 					type_pos = start_type_pos.extend(p.prev_tok.pos())
 				}

diff --git a/vlib/v/parser/tests/struct_anon_invalid_embed_err.out b/vlib/v/parser/tests/struct_anon_invalid_embed_err.out
@@ -1,6 +1,6 @@
-vlib/v/parser/tests/struct_anon_invalid_embed_err.vv:3:6: error: field-name `Int` cannot be same as the type-name
+vlib/v/parser/tests/struct_anon_invalid_embed_err.vv:2:16: error: invalid anonymous struct
     1 | type Int = int
     2 | type MyIndex = struct {
+      |                ~~~~~~~~
     3 |     Int Int
-      |         ~~~
     4 | }