vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

cgen: fix struct equality (#7649)

pull/7658/head
yuyi 2020-12-29 00:22:47 +08:00 committed by GitHub
parent 4783503185
commit 32091dd90e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 77 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
vlib/v/gen/auto_eq_methods.v
View File

@ -18,28 +18,21 @@ fn (mut g Gen) gen_struct_equality_fn(left table.Type) string {
fn_builder.writeln('static bool ${ptr_typ}_struct_eq($ptr_typ a, $ptr_typ b) {') fn_builder.writeln('static bool ${ptr_typ}_struct_eq($ptr_typ a, $ptr_typ b) {')
for field in info.fields { for field in info.fields {
sym := g.table.get_type_symbol(field.typ) sym := g.table.get_type_symbol(field.typ)
match sym.kind { if sym.kind == .string {
.string { fn_builder.writeln('\tif (string_ne(a.$field.name, b.$field.name)) {')
fn_builder.writeln('\tif (string_ne(a.$field.name, b.$field.name)) {') } else if sym.kind == .struct_ && !field.typ.is_ptr() {
} eq_fn := g.gen_struct_equality_fn(field.typ)
.struct_ { fn_builder.writeln('\tif (!${eq_fn}_struct_eq(a.$field.name, b.$field.name)) {')
eq_fn := g.gen_struct_equality_fn(field.typ) } else if sym.kind == .array && !field.typ.is_ptr() {
fn_builder.writeln('\tif (!${eq_fn}_struct_eq(a.$field.name, b.$field.name)) {') eq_fn := g.gen_array_equality_fn(field.typ)
} fn_builder.writeln('\tif (!${eq_fn}_arr_eq(a.$field.name, b.$field.name)) {')
.array { } else if sym.kind == .map && !field.typ.is_ptr() {
eq_fn := g.gen_array_equality_fn(field.typ) eq_fn := g.gen_map_equality_fn(field.typ)
fn_builder.writeln('\tif (!${eq_fn}_arr_eq(a.$field.name, b.$field.name)) {') fn_builder.writeln('\tif (!${eq_fn}_map_eq(a.$field.name, b.$field.name)) {')
} } else if sym.kind == .function {
.map { fn_builder.writeln('\tif (*((voidptr*)(a.$field.name)) != *((voidptr*)(b.$field.name))) {')
eq_fn := g.gen_map_equality_fn(field.typ) } else {
fn_builder.writeln('\tif (!${eq_fn}_map_eq(a.$field.name, b.$field.name)) {') fn_builder.writeln('\tif (a.$field.name != b.$field.name) {')
}
.function {
fn_builder.writeln('\tif (*((voidptr*)(a.$field.name)) != *((voidptr*)(b.$field.name))) {')
}
else {
fn_builder.writeln('\tif (a.$field.name != b.$field.name) {')
}
} }
fn_builder.writeln('\t\treturn false;') fn_builder.writeln('\t\treturn false;')
fn_builder.writeln('\t}') fn_builder.writeln('\t}')
@ -68,28 +61,21 @@ fn (mut g Gen) gen_array_equality_fn(left table.Type) string {
fn_builder.writeln('\t}') fn_builder.writeln('\t}')
fn_builder.writeln('\tfor (int i = 0; i < a.len; ++i) {') fn_builder.writeln('\tfor (int i = 0; i < a.len; ++i) {')
// compare every pair of elements of the two arrays // compare every pair of elements of the two arrays
match elem_sym.kind { if elem_sym.kind == .string {
.string { fn_builder.writeln('\t\tif (string_ne(*(($ptr_elem_typ*)((byte*)a.data+(i*a.element_size))), *(($ptr_elem_typ*)((byte*)b.data+(i*b.element_size))))) {')
fn_builder.writeln('\t\tif (string_ne(*(($ptr_elem_typ*)((byte*)a.data+(i*a.element_size))), *(($ptr_elem_typ*)((byte*)b.data+(i*b.element_size))))) {') } else if elem_sym.kind == .struct_ && !elem_typ.is_ptr() {
} eq_fn := g.gen_struct_equality_fn(elem_typ)
.struct_ { fn_builder.writeln('\t\tif (!${eq_fn}_struct_eq((($ptr_elem_typ*)a.data)[i], (($ptr_elem_typ*)b.data)[i])) {')
eq_fn := g.gen_struct_equality_fn(elem_typ) } else if elem_sym.kind == .array && !elem_typ.is_ptr() {
fn_builder.writeln('\t\tif (!${eq_fn}_struct_eq((($ptr_elem_typ*)a.data)[i], (($ptr_elem_typ*)b.data)[i])) {') eq_fn := g.gen_array_equality_fn(elem_typ)
} fn_builder.writeln('\t\tif (!${eq_fn}_arr_eq((($ptr_elem_typ*)a.data)[i], (($ptr_elem_typ*)b.data)[i])) {')
.array { } else if elem_sym.kind == .map && !elem_typ.is_ptr() {
eq_fn := g.gen_array_equality_fn(elem_typ) eq_fn := g.gen_map_equality_fn(elem_typ)
fn_builder.writeln('\t\tif (!${eq_fn}_arr_eq((($ptr_elem_typ*)a.data)[i], (($ptr_elem_typ*)b.data)[i])) {') fn_builder.writeln('\t\tif (!${eq_fn}_map_eq((($ptr_elem_typ*)a.data)[i], (($ptr_elem_typ*)b.data)[i])) {')
} } else if elem_sym.kind == .function {
.map { fn_builder.writeln('\t\tif (*((voidptr*)((byte*)a.data+(i*a.element_size))) != *((voidptr*)((byte*)b.data+(i*b.element_size)))) {')
eq_fn := g.gen_map_equality_fn(elem_typ) } else {
fn_builder.writeln('\t\tif (!${eq_fn}_map_eq((($ptr_elem_typ*)a.data)[i], (($ptr_elem_typ*)b.data)[i])) {') fn_builder.writeln('\t\tif (*(($ptr_elem_typ*)((byte*)a.data+(i*a.element_size))) != *(($ptr_elem_typ*)((byte*)b.data+(i*b.element_size)))) {')
}
.function {
fn_builder.writeln('\t\tif (*((voidptr*)((byte*)a.data+(i*a.element_size))) != *((voidptr*)((byte*)b.data+(i*b.element_size)))) {')
}
else {
fn_builder.writeln('\t\tif (*(($ptr_elem_typ*)((byte*)a.data+(i*a.element_size))) != *(($ptr_elem_typ*)((byte*)b.data+(i*b.element_size)))) {')
}
} }
fn_builder.writeln('\t\t\treturn false;') fn_builder.writeln('\t\t\treturn false;')
fn_builder.writeln('\t\t}') fn_builder.writeln('\t\t}')
@ -135,28 +121,21 @@ fn (mut g Gen) gen_map_equality_fn(left table.Type) string {
} else { } else {
fn_builder.writeln('\t\t$ptr_value_typ v = (*($ptr_value_typ*)map_get_1(&a, &k, &($ptr_value_typ[]){ 0 }));') fn_builder.writeln('\t\t$ptr_value_typ v = (*($ptr_value_typ*)map_get_1(&a, &k, &($ptr_value_typ[]){ 0 }));')
} }
match value_sym.kind { if value_sym.kind == .string {
.string { fn_builder.writeln('\t\tif (!map_exists_1(&b, &k) || string_ne((*(string*)map_get_1(&b, &k, &(string[]){_SLIT("")})), v)) {')
fn_builder.writeln('\t\tif (!map_exists_1(&b, &k) || string_ne((*(string*)map_get_1(&b, &k, &(string[]){_SLIT("")})), v)) {') } else if value_sym.kind == .struct_ && !value_typ.is_ptr() {
} eq_fn := g.gen_struct_equality_fn(value_typ)
.struct_ { fn_builder.writeln('\t\tif (!map_exists_1(&b, &k) || !${eq_fn}_struct_eq(*($ptr_value_typ*)map_get_1(&b, &k, &($ptr_value_typ[]){ 0 }), v)) {')
eq_fn := g.gen_struct_equality_fn(value_typ) } else if value_sym.kind == .array && !value_typ.is_ptr() {
fn_builder.writeln('\t\tif (!map_exists_1(&b, &k) || !${eq_fn}_struct_eq(*($ptr_value_typ*)map_get_1(&b, &k, &($ptr_value_typ[]){ 0 }), v)) {') eq_fn := g.gen_array_equality_fn(value_typ)
} fn_builder.writeln('\t\tif (!map_exists_1(&b, &k) || !${eq_fn}_arr_eq(*($ptr_value_typ*)map_get_1(&b, &k, &($ptr_value_typ[]){ 0 }), v)) {')
.array { } else if value_sym.kind == .map && !value_typ.is_ptr() {
eq_fn := g.gen_array_equality_fn(value_typ) eq_fn := g.gen_map_equality_fn(value_typ)
fn_builder.writeln('\t\tif (!map_exists_1(&b, &k) || !${eq_fn}_arr_eq(*($ptr_value_typ*)map_get_1(&b, &k, &($ptr_value_typ[]){ 0 }), v)) {') fn_builder.writeln('\t\tif (!map_exists_1(&b, &k) || !${eq_fn}_map_eq(*($ptr_value_typ*)map_get_1(&b, &k, &($ptr_value_typ[]){ 0 }), v)) {')
} } else if value_sym.kind == .function {
.map { fn_builder.writeln('\t\tif (!map_exists_1(&b, &k) || (*(voidptr*)map_get_1(&b, &k, &(voidptr[]){ 0 })) != v) {')
eq_fn := g.gen_map_equality_fn(value_typ) } else {
fn_builder.writeln('\t\tif (!map_exists_1(&b, &k) || !${eq_fn}_map_eq(*($ptr_value_typ*)map_get_1(&b, &k, &($ptr_value_typ[]){ 0 }), v)) {') fn_builder.writeln('\t\tif (!map_exists_1(&b, &k) || (*($ptr_value_typ*)map_get_1(&b, &k, &($ptr_value_typ[]){ 0 })) != v) {')
}
.function {
fn_builder.writeln('\t\tif (!map_exists_1(&b, &k) || (*(voidptr*)map_get_1(&b, &k, &(voidptr[]){ 0 })) != v) {')
}
else {
fn_builder.writeln('\t\tif (!map_exists_1(&b, &k) || (*($ptr_value_typ*)map_get_1(&b, &k, &($ptr_value_typ[]){ 0 })) != v) {')
}
} }
fn_builder.writeln('\t\t\treturn false;') fn_builder.writeln('\t\t\treturn false;')
fn_builder.writeln('\t\t}') fn_builder.writeln('\t\t}')

17
vlib/v/gen/cgen.v
View File

@ -3036,6 +3036,23 @@ fn (mut g Gen) infix_expr(node ast.InfixExpr) {
} }
g.expr(node.right) g.expr(node.right)
g.write(')') g.write(')')
} else if node.op in [.eq, .ne] && left_sym.kind == .struct_ && right_sym.kind == .struct_ {
ptr_typ := g.gen_struct_equality_fn(left_type)
if node.op == .eq {
g.write('${ptr_typ}_struct_eq(')
} else if node.op == .ne {
g.write('!${ptr_typ}_struct_eq(')
}
if node.left_type.is_ptr() {
g.write('*')
}
g.expr(node.left)
g.write(', ')
if node.right_type.is_ptr() {
g.write('*')
}
g.expr(node.right)
g.write(')')
} else if node.op in [.key_in, .not_in] { } else if node.op in [.key_in, .not_in] {
if node.op == .not_in { if node.op == .not_in {
g.write('!') g.write('!')

15
vlib/v/tests/struct_equality_test.v 100644
View File

@ -0,0 +1,15 @@
struct User {
name string
age int
}
fn test_struct_equality() {
mut usr1 := User{'sanath', 28}
mut usr2 := User{'sanath', 28}
if usr1 == usr2 {
println('Same User')
} else {
println('Not same User')
}
assert usr1 == usr2
}