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 argument dereference for str method when receiver is ptr (#17648)

Browse Source
This commit is contained in:
Felipe Pena 2023-03-16 16:28:14 -03:00 committed by GitHub
parent f5b67802fd
commit 25eabf8e2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vlib/v/gen/c/auto_str_methods.v
View File

@ -713,7 +713,12 @@ fn (mut g Gen) gen_str_for_map(info ast.Map, styp string, str_fn_name string) {
}
val_styp := g.typ(val_typ)
mut elem_str_fn_name := val_styp.replace('*', '') + '_str'
if val_sym.has_method_with_generic_parent('str') {
mut receiver_is_ptr := false
fn_str := val_sym.find_method_with_generic_parent('str') or { ast.Fn{} }
if fn_str.name == 'str' {
receiver_is_ptr = fn_str.receiver_type.is_ptr()
match mut val_sym.info {
ast.Struct, ast.Interface, ast.SumType {
if val_sym.info.generic_types.len > 0 {
@ -755,7 +760,7 @@ fn (mut g Gen) gen_str_for_map(info ast.Map, styp string, str_fn_name string) {
} else if val_sym.kind == .string {
tmp_str := str_intp_sq('*(${val_styp}*)DenseArray_value(&m.key_values, i)')
g.auto_str_funcs.writeln('\t\tstrings__Builder_write_string(&sb, ${tmp_str});')
} else if should_use_indent_func(val_sym.kind) && !val_sym.has_method_with_generic_parent('str') {
} else if should_use_indent_func(val_sym.kind) && fn_str.name != 'str' {
ptr_str := '*'.repeat(val_typ.nr_muls())
g.auto_str_funcs.writeln('\t\tstrings__Builder_write_string(&sb, indent_${elem_str_fn_name}(*${ptr_str}(${val_styp}*)DenseArray_value(&m.key_values, i), indent_count));')
} else if val_sym.kind in [.f32, .f64] {
@ -769,7 +774,7 @@ fn (mut g Gen) gen_str_for_map(info ast.Map, styp string, str_fn_name string) {
tmp_str := str_intp_rune('${elem_str_fn_name}(*(${val_styp}*)DenseArray_value(&m.key_values, i))')
g.auto_str_funcs.writeln('\t\tstrings__Builder_write_string(&sb, ${tmp_str});')
} else {
ptr_str := '*'.repeat(val_typ.nr_muls())
ptr_str := '*'.repeat(if receiver_is_ptr { val_typ.nr_muls() - 1 } else { val_typ.nr_muls() })
g.auto_str_funcs.writeln('\t\tstrings__Builder_write_string(&sb, ${elem_str_fn_name}(*${ptr_str}(${val_styp}*)DenseArray_value(&m.key_values, i)));')
}
g.auto_str_funcs.writeln('\t\tif (i != m.key_values.len-1) {')

18
vlib/v/tests/ptr_str_method_test.v Normal file
View File

@ -0,0 +1,18 @@
module main
struct Name {
age int = 222
}
fn (n &Name) str() string {
return n.age.str()
}
fn test_str_method_with_ptr() {
name := &Name{}
mut mp := map[string]&Name{}
mp['aaa'] = name
assert mp.str() == "{'aaa': 222}"
assert name.str() == '222'
}