mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

cgen: fix comparing struct with pointers to interface values (fix #16074) (#16215)

Browse Source
This commit is contained in:
shove 2022-10-28 11:47:31 +08:00 committed by GitHub
parent 992106c6f7
commit c5ee33b7aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vlib/v/gen/c/auto_eq_methods.v
View File

@ -156,8 +156,9 @@ fn (mut g Gen) gen_struct_equality_fn(left_type ast.Type) string {
} else if field_type.sym.kind == .function {
fn_builder.write_string('*((voidptr*)(a.$field_name)) == *((voidptr*)(b.$field_name))')
} else if field_type.sym.kind == .interface_ {
ptr := if field.typ.is_ptr() { '*'.repeat(field.typ.nr_muls()) } else { '' }
eq_fn := g.gen_interface_equality_fn(field.typ)
fn_builder.write_string('${eq_fn}_interface_eq(a.$field_name, b.$field_name)')
fn_builder.write_string('${eq_fn}_interface_eq(${ptr}a.$field_name, ${ptr}b.$field_name)')
} else {
fn_builder.write_string('a.$field_name == b.$field_name')
}
@ -450,7 +451,7 @@ fn (mut g Gen) gen_interface_equality_fn(left_type ast.Type) string {
fn_builder.write_string('${eq_fn}_alias_eq(*(a._$eq_fn), *(b._$eq_fn))')
}
else {
fn_builder.write_string('false')
fn_builder.write_string('true')
}
}
fn_builder.writeln(';')

20
vlib/v/tests/struct_auto_eq_gen_interface_test.v
View File

@ -21,3 +21,23 @@ fn test_struct_auto_eq_gen_interface_case() {
w2 := new()
assert w1 == w2
}
// For https://github.com/vlang/v/issues/16074
pub interface Logger {
mut:
info(s string)
}
struct LogContainer {
name string
mut:
logger &Logger = unsafe { nil }
}
fn test_comparing_struct_with_pointers_to_interface_values_autogenerates_working_eq_method() {
assert LogContainer{
name: 'abc'
} == LogContainer{
name: 'abc'
}
}