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

gen: support non-string map equality and speed it up (#7682)

pull/7792/head
Nick Treleaven 2021-01-01 19:54:49 +00:00 committed by GitHub
parent 0c77bdf8f6
commit 0a069dee79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vlib/builtin/map_test.v
View File

@ -487,7 +487,10 @@ fn test_int_keys() {
assert m[5] == 25 assert m[5] == 25
m2 := {3:9 4:16 5:25} m2 := {3:9 4:16 5:25}
assert m2.len == 3 assert m2.len == 3
// clone
mc := m.clone() mc := m.clone()
same := mc == m
assert same
assert mc.len == 3 assert mc.len == 3
mut all := []int{} mut all := []int{}
for k, v in mc { for k, v in mc {

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

@ -94,7 +94,6 @@ fn (mut g Gen) gen_map_equality_fn(left table.Type) string {
g.map_fn_definitions << ptr_typ g.map_fn_definitions << ptr_typ
left_sym := g.table.get_type_symbol(left) left_sym := g.table.get_type_symbol(left)
value_typ := left_sym.map_info().value_type value_typ := left_sym.map_info().value_type
value_sym := g.table.get_type_symbol(value_typ)
ptr_value_typ := g.typ(value_typ) ptr_value_typ := g.typ(value_typ)
g.type_definitions.writeln('static bool ${ptr_typ}_map_eq($ptr_typ a, $ptr_typ b); // auto') g.type_definitions.writeln('static bool ${ptr_typ}_map_eq($ptr_typ a, $ptr_typ b); // auto')
mut fn_builder := strings.new_builder(512) mut fn_builder := strings.new_builder(512)
@ -102,10 +101,13 @@ fn (mut g Gen) gen_map_equality_fn(left table.Type) string {
fn_builder.writeln('\tif (a.len != b.len) {') fn_builder.writeln('\tif (a.len != b.len) {')
fn_builder.writeln('\t\treturn false;') fn_builder.writeln('\t\treturn false;')
fn_builder.writeln('\t}') fn_builder.writeln('\t}')
fn_builder.writeln('\tarray_string _keys = map_keys(&a);') fn_builder.writeln('\tfor (int i = 0; i < a.key_values.len; ++i) {')
fn_builder.writeln('\tfor (int i = 0; i < _keys.len; ++i) {') fn_builder.writeln('\t\tif (!DenseArray_has_index(&a.key_values, i)) continue;')
fn_builder.writeln('\t\tstring k = string_clone( ((string*)_keys.data)[i]);') fn_builder.writeln('\t\tvoidptr k = DenseArray_key(&a.key_values, i);')
if value_sym.kind == .function { fn_builder.writeln('\t\tif (!map_exists_1(&b, k)) return false;')
kind := g.table.type_kind(value_typ)
if kind == .function {
value_sym := g.table.get_type_symbol(value_typ)
func := value_sym.info as table.FnType func := value_sym.info as table.FnType
ret_styp := g.typ(func.func.return_type) ret_styp := g.typ(func.func.return_type)
fn_builder.write('\t\t$ret_styp (*v) (') fn_builder.write('\t\t$ret_styp (*v) (')
@ -117,25 +119,32 @@ fn (mut g Gen) gen_map_equality_fn(left table.Type) string {
fn_builder.write(', ') fn_builder.write(', ')
} }
} }
fn_builder.writeln(') = (*(voidptr*)map_get_1(&a, &k, &(voidptr[]){ 0 }));') fn_builder.writeln(') = *(voidptr*)map_get_1(&a, k, &(voidptr[]){ 0 });')
} 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 });')
} }
if value_sym.kind == .string { match kind {
fn_builder.writeln('\t\tif (!map_exists_1(&b, &k) || string_ne((*(string*)map_get_1(&b, &k, &(string[]){_SLIT("")})), v)) {') .string {
} else if value_sym.kind == .struct_ && !value_typ.is_ptr() { fn_builder.writeln('\t\tif (!fast_string_eq(*(string*)map_get_1(&b, k, &(string[]){_SLIT("")}), v)) {')
}
.struct_ {
eq_fn := g.gen_struct_equality_fn(value_typ) eq_fn := g.gen_struct_equality_fn(value_typ)
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)) {') fn_builder.writeln('\t\tif (!${eq_fn}_struct_eq(*($ptr_value_typ*)map_get_1(&b, k, &($ptr_value_typ[]){ 0 }), v)) {')
} else if value_sym.kind == .array && !value_typ.is_ptr() { }
.array {
eq_fn := g.gen_array_equality_fn(value_typ) 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)) {') fn_builder.writeln('\t\tif (!${eq_fn}_arr_eq(*($ptr_value_typ*)map_get_1(&b, k, &($ptr_value_typ[]){ 0 }), v)) {')
} else if value_sym.kind == .map && !value_typ.is_ptr() { }
.map {
eq_fn := g.gen_map_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}_map_eq(*($ptr_value_typ*)map_get_1(&b, &k, &($ptr_value_typ[]){ 0 }), v)) {') fn_builder.writeln('\t\tif (!${eq_fn}_map_eq(*($ptr_value_typ*)map_get_1(&b, k, &($ptr_value_typ[]){ 0 }), v)) {')
} else if value_sym.kind == .function { }
fn_builder.writeln('\t\tif (!map_exists_1(&b, &k) || (*(voidptr*)map_get_1(&b, &k, &(voidptr[]){ 0 })) != v) {') .function {
} else { fn_builder.writeln('\t\tif (*(voidptr*)map_get_1(&b, k, &(voidptr[]){ 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) {') }
else {
fn_builder.writeln('\t\tif (*($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}')