mirror of
https://github.com/vlang/v.git
synced 2023-08-10 21:13:21 +03:00
cgen: fix embedded struct init with complex fields (#12831)
This commit is contained in:
parent
99f14a7ead
commit
eeb7d4a7fd
@ -6807,11 +6807,25 @@ fn (mut g Gen) type_default(typ_ ast.Type) string {
|
|||||||
|| field_sym.kind in [.array, .map, .string, .bool, .alias, .i8, .i16, .int, .i64, .byte, .u16, .u32, .u64, .char, .voidptr, .byteptr, .charptr, .struct_] {
|
|| field_sym.kind in [.array, .map, .string, .bool, .alias, .i8, .i16, .int, .i64, .byte, .u16, .u32, .u64, .char, .voidptr, .byteptr, .charptr, .struct_] {
|
||||||
field_name := c_name(field.name)
|
field_name := c_name(field.name)
|
||||||
if field.has_default_expr {
|
if field.has_default_expr {
|
||||||
expr_str := g.expr_string_with_cast(field.default_expr, field.default_expr_typ,
|
mut expr_str := ''
|
||||||
field.typ)
|
if g.table.get_type_symbol(field.typ).kind in [.sum_type, .interface_] {
|
||||||
|
expr_str = g.expr_string_with_cast(field.default_expr,
|
||||||
|
field.default_expr_typ, field.typ)
|
||||||
|
} else {
|
||||||
|
expr_str = g.expr_string(field.default_expr)
|
||||||
|
}
|
||||||
init_str += '.$field_name = $expr_str,'
|
init_str += '.$field_name = $expr_str,'
|
||||||
} else {
|
} else {
|
||||||
init_str += '.$field_name = ${g.type_default(field.typ)},'
|
mut zero_str := g.type_default(field.typ)
|
||||||
|
if zero_str == '{0}' {
|
||||||
|
if field_sym.info is ast.Struct {
|
||||||
|
if field_sym.info.fields.len == 0
|
||||||
|
&& field_sym.info.embeds.len == 0 {
|
||||||
|
zero_str = '{EMPTY_STRUCT_INITIALIZATION}'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
init_str += '.$field_name = $zero_str,'
|
||||||
}
|
}
|
||||||
has_none_zero = true
|
has_none_zero = true
|
||||||
}
|
}
|
||||||
|
21
vlib/v/tests/struct_init_with_complex_fields_test.v
Normal file
21
vlib/v/tests/struct_init_with_complex_fields_test.v
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
struct Bar {}
|
||||||
|
|
||||||
|
type Fnc = fn ()
|
||||||
|
|
||||||
|
struct Foo {
|
||||||
|
Bar
|
||||||
|
fnc_fn Fnc = voidptr(0)
|
||||||
|
}
|
||||||
|
|
||||||
|
struct App {
|
||||||
|
mut:
|
||||||
|
foo Foo
|
||||||
|
}
|
||||||
|
|
||||||
|
fn test_struct_init_with_complex_fields() {
|
||||||
|
mut app := App{}
|
||||||
|
println(app)
|
||||||
|
ret := '$app'
|
||||||
|
assert ret.contains('Bar: Bar{}')
|
||||||
|
assert ret.contains('fnc_fn: fn ()')
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user