builtin, checker, cgen: expose is_embed in FieldData (#25232)

Larsimusrex · web-flow · commit 682db6685219 · 2025-09-04T11:39:24.000+03:00
diff --git a/vlib/builtin/builtin.v b/vlib/builtin/builtin.v
@@ -124,9 +124,10 @@ pub:
 	typ           int    // the internal TypeID of the field f,
 	unaliased_typ int    // if f's type was an alias of int, this will be TypeID(int)
 
-	attrs  []string // the attributes of the field f
-	is_pub bool     // f is in a `pub:` section
-	is_mut bool     // f is in a `mut:` section
+	attrs    []string // the attributes of the field f
+	is_pub   bool     // f is in a `pub:` section
+	is_mut   bool     // f is in a `mut:` section
+	is_embed bool     // f is a embedded struct
 
 	is_shared bool // `f shared Abc`
 	is_atomic bool // `f atomic int` , TODO
diff --git a/vlib/v/checker/comptime.v b/vlib/v/checker/comptime.v
@@ -1398,7 +1398,7 @@ fn (mut c Checker) comptime_if_cond(mut cond ast.Expr, mut sb strings.Builder) (
 		}
 		ast.SelectorExpr {
 			if c.comptime.comptime_for_field_var != '' && cond.expr is ast.Ident {
-				if (cond.expr as ast.Ident).name == c.comptime.comptime_for_field_var && cond.field_name in ['is_mut', 'is_pub', 'is_shared', 'is_atomic', 'is_option', 'is_array', 'is_map', 'is_chan', 'is_struct', 'is_alias', 'is_enum'] {
+				if (cond.expr as ast.Ident).name == c.comptime.comptime_for_field_var && cond.field_name in ['is_mut', 'is_pub', 'is_embed', 'is_shared', 'is_atomic', 'is_option', 'is_array', 'is_map', 'is_chan', 'is_struct', 'is_alias', 'is_enum'] {
 					is_true = c.type_resolver.get_comptime_selector_bool_field(cond.field_name)
 					sb.write_string('${is_true}')
 					return is_true, true
diff --git a/vlib/v/gen/c/comptime.v b/vlib/v/gen/c/comptime.v
@@ -740,6 +740,7 @@ fn (mut g Gen) comptime_for(node ast.ComptimeFor) {
 				g.writeln('\t${node.val_var}.unaliased_typ = ${int(unaliased_styp.idx())};\t// ${g.table.type_to_str(unaliased_styp)}')
 				g.writeln('\t${node.val_var}.is_pub = ${field.is_pub};')
 				g.writeln('\t${node.val_var}.is_mut = ${field.is_mut};')
+				g.writeln('\t${node.val_var}.is_embed = ${field.is_embed};')
 
 				g.writeln('\t${node.val_var}.is_shared = ${field.typ.has_flag(.shared_f)};')
 				g.writeln('\t${node.val_var}.is_atomic = ${field.typ.has_flag(.atomic_f)};')
diff --git a/vlib/v/tests/comptime/comptime_for_test.v b/vlib/v/tests/comptime/comptime_for_test.v
@@ -1,4 +1,5 @@
 struct App {
+	Inner
 	a string
 	b string
 mut:
@@ -12,6 +13,8 @@ pub mut:
 	h u8
 }
 
+struct Inner {}
+
 @['foo/bar/three']
 fn (mut app App) run() {
 }
@@ -85,13 +88,16 @@ fn test_comptime_for_fields() {
 			assert field.name in ['d', 'e']
 		}
 		if field.is_mut {
-			assert field.name in ['c', 'd', 'g', 'h']
+			assert field.name in ['c', 'd', 'g', 'h', 'Inner']
 		}
 		if field.is_pub {
-			assert field.name in ['e', 'f', 'g', 'h']
+			assert field.name in ['e', 'f', 'g', 'h', 'Inner']
 		}
 		if field.is_pub && field.is_mut {
-			assert field.name in ['g', 'h']
+			assert field.name in ['g', 'h', 'Inner']
+		}
+		if field.is_embed {
+			assert field.name == 'Inner'
 		}
 		if field.name == 'f' {
 			assert sizeof(field) == 8
diff --git a/vlib/v/type_resolver/comptime_resolver.v b/vlib/v/type_resolver/comptime_resolver.v
@@ -224,6 +224,7 @@ pub fn (mut t TypeResolver) get_comptime_selector_bool_field(field_name string)
 	match field_name {
 		'is_pub' { return field.is_pub }
 		'is_mut' { return field.is_mut }
+		'is_embed' { return field.is_embed }
 		'is_shared' { return field_typ.has_flag(.shared_f) }
 		'is_atomic' { return field_typ.has_flag(.atomic_f) }
 		'is_option' { return field.typ.has_flag(.option) }

Original file line number	Diff line number	Diff line change
`@@ -1398,7 +1398,7 @@ fn (mut c Checker) comptime_if_cond(mut cond ast.Expr, mut sb strings.Builder) (`
`1398`	`1398`	`}`
`1399`	`1399`	`ast.SelectorExpr {`
`1400`	`1400`	`if c.comptime.comptime_for_field_var != '' && cond.expr is ast.Ident {`
`1401`		`- if (cond.expr as ast.Ident).name == c.comptime.comptime_for_field_var && cond.field_name in ['is_mut', 'is_pub', 'is_shared', 'is_atomic', 'is_option', 'is_array', 'is_map', 'is_chan', 'is_struct', 'is_alias', 'is_enum'] {`
	`1401`	`+ if (cond.expr as ast.Ident).name == c.comptime.comptime_for_field_var && cond.field_name in ['is_mut', 'is_pub', 'is_embed', 'is_shared', 'is_atomic', 'is_option', 'is_array', 'is_map', 'is_chan', 'is_struct', 'is_alias', 'is_enum'] {`
`1402`	`1402`	`is_true = c.type_resolver.get_comptime_selector_bool_field(cond.field_name)`
`1403`	`1403`	`sb.write_string('${is_true}')`
`1404`	`1404`	`return is_true, true`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`struct App {`
	`2`	`+ Inner`
`2`	`3`	`a string`
`3`	`4`	`b string`
`4`	`5`	`mut:`
`@@ -12,6 +13,8 @@ pub mut:`
`12`	`13`	`h u8`
`13`	`14`	`}`
`14`	`15`
	`16`	`+struct Inner {}`
	`17`	`+`
`15`	`18`	`@['foo/bar/three']`
`16`	`19`	`fn (mut app App) run() {`
`17`	`20`	`}`
`@@ -85,13 +88,16 @@ fn test_comptime_for_fields() {`
`85`	`88`	`assert field.name in ['d', 'e']`
`86`	`89`	`}`
`87`	`90`	`if field.is_mut {`
`88`		`- assert field.name in ['c', 'd', 'g', 'h']`
	`91`	`+ assert field.name in ['c', 'd', 'g', 'h', 'Inner']`
`89`	`92`	`}`
`90`	`93`	`if field.is_pub {`
`91`		`- assert field.name in ['e', 'f', 'g', 'h']`
	`94`	`+ assert field.name in ['e', 'f', 'g', 'h', 'Inner']`
`92`	`95`	`}`
`93`	`96`	`if field.is_pub && field.is_mut {`
`94`		`- assert field.name in ['g', 'h']`
	`97`	`+ assert field.name in ['g', 'h', 'Inner']`
	`98`	`+ }`
	`99`	`+ if field.is_embed {`
	`100`	`+ assert field.name == 'Inner'`
`95`	`101`	`}`
`96`	`102`	`if field.name == 'f' {`
`97`	`103`	`assert sizeof(field) == 8`