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 dump of map with option value fix (fix #18806) (#18813)

Browse Source
This commit is contained in:
Felipe Pena
2023-07-08 01:07:24 -03:00
committed by GitHub
parent 54635185c4
commit 4f518c2850
2 changed files with 60 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -783,24 +783,37 @@ fn (mut g Gen) gen_str_for_map(info ast.Map, styp string, str_fn_name string) {
if val_sym.kind == .function {
g.auto_str_funcs.writeln('\t\tstrings__Builder_write_string(&sb, ${elem_str_fn_name}());')
} 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});')
if val_typ.has_flag(.option) {
func := g.get_str_fn(val_typ)
g.auto_str_funcs.writeln('\t\tstrings__Builder_write_string(&sb, ${func}(*(${val_styp}*)DenseArray_value(&m.key_values, i)));')
} else {
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) && 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] {
tmp_val := '*(${val_styp}*)DenseArray_value(&m.key_values, i)'
if val_sym.kind == .f32 {
g.auto_str_funcs.writeln('\t\tstrings__Builder_write_string(&sb, ${str_intp_g32(tmp_val)});')
if val_typ.has_flag(.option) {
g.auto_str_funcs.writeln('\t\tstrings__Builder_write_string(&sb, ${g.get_str_fn(val_typ)}(*(${val_styp}*)DenseArray_value(&m.key_values, i)));')
} else {
g.auto_str_funcs.writeln('\t\tstrings__Builder_write_string(&sb, ${str_intp_g64(tmp_val)});')
if val_sym.kind == .f32 {
g.auto_str_funcs.writeln('\t\tstrings__Builder_write_string(&sb, ${str_intp_g32(tmp_val)});')
} else {
g.auto_str_funcs.writeln('\t\tstrings__Builder_write_string(&sb, ${str_intp_g64(tmp_val)});')
}
}
} else if val_sym.kind == .rune {
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(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)));')
if val_typ.has_flag(.option) {
g.auto_str_funcs.writeln('\t\tstrings__Builder_write_string(&sb, ${g.get_str_fn(val_typ)}(*${ptr_str}(${val_styp}*)DenseArray_value(&m.key_values, i)));')
} else {
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\tis_first = false;')
g.auto_str_funcs.writeln('\t}')

41
vlib/v/tests/option_map_value_test.v Normal file
View File

@@ -0,0 +1,41 @@
struct Struct {
a int
}
fn test_str() {
mut data := map[string]?string{}
data = {
'name': ?string('andre')
'age': ?string('')
}
dump(data)
}
fn test_complex() {
mut data := map[string]?Struct{}
data = {
'a': ?Struct{
a: 1
}
'b': ?Struct{}
}
dump(data)
}
fn test_int() {
mut data := map[string]?int{}
data = {
'a': ?int(0)
'b': ?int(none)
}
dump(data)
}
fn test_f64() {
mut data := map[string]?f64{}
data = {
'a': ?f64(0)
'b': ?f64(none)
}
dump(data)
}