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: optimize map_to_string format

Browse Source
This commit is contained in:
yuyi 2020-04-27 16:52:21 +08:00 committed by GitHub
parent c84dee5968
commit 99a7b69578
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3209,17 +3209,17 @@ fn (mut g Gen) gen_str_for_map(info table.Map, styp, str_fn_name string) {
g.definitions.writeln('string ${str_fn_name}($styp m); // auto')
g.auto_str_funcs.writeln('string ${str_fn_name}($styp m) { /* gen_str_for_map */')
g.auto_str_funcs.writeln('\tstrings__Builder sb = strings__new_builder(m.key_values.size*10);')
g.auto_str_funcs.writeln('\tstrings__Builder_write(&sb, tos3("$styp"));')
g.auto_str_funcs.writeln('\tstrings__Builder_write(&sb, tos3("{"));')
g.auto_str_funcs.writeln('\tfor (unsigned int i = 0; i < m.key_values.size; i++) {')
g.auto_str_funcs.writeln('\t\tstrings__Builder_write(&sb, (*(string*)DenseArray_get(m.key_values, i)));')
g.auto_str_funcs.writeln('\t\tstring key = (*(string*)DenseArray_get(m.key_values, i));')
g.auto_str_funcs.writeln('\t\tstrings__Builder_write(&sb, _STR("\\"%.*s\\"", key.len, key.str));')
g.auto_str_funcs.writeln('\t\tstrings__Builder_write(&sb, tos3(": "));')
g.auto_str_funcs.write('\t$val_styp it = (*($val_styp*)map_get3(')
g.auto_str_funcs.write('m, (*(string*)DenseArray_get(m.key_values, i))')
g.auto_str_funcs.write(', ')
g.auto_str_funcs.writeln(' &($val_styp[]) { $zero }));')
if val_sym.kind == .string {
g.auto_str_funcs.writeln('\t\tstrings__Builder_write(&sb, it);')
g.auto_str_funcs.writeln('\t\tstrings__Builder_write(&sb, _STR("\\"%.*s\\"", it.len, it.str));')
} else if val_sym.kind == .struct_ && !val_sym.has_method('str') {
g.auto_str_funcs.writeln('\t\tstrings__Builder_write(&sb, ${val_styp}_str(it,0));')
} else if val_sym.kind in [.f32, .f64] {

32
vlib/v/tests/map_to_string_test.v
View File

@ -5,28 +5,34 @@ struct Test {
}
fn test_interpolation_map_to_string() {
if true {
}
//
else{}
mut a := map[string]string
a['1'] = 'one'
a['2'] = 'two'
a['3'] = 'three'
assert '$a' == 'map_string_string{1: one, 2: two, 3: three}'
assert '$a' == '{"1": "one", "2": "two", "3": "three"}'
mut b := map[string]int
b['1'] = 1
b['2'] = 2
b['3'] = 3
assert '$b' == 'map_string_int{1: 1, 2: 2, 3: 3}'
assert '$b' == '{"1": 1, "2": 2, "3": 3}'
mut c := map[string]bool
c['1'] = true
c['2'] = false
assert '$c' == 'map_string_bool{1: true, 2: false}'
mut d := map[string]Test
d['1'] = Test{true, 0, 'abc'}
d['2'] = Test{true, 1, 'def'}
d['3'] = Test{false, 2, 'ghi'}
assert '$d'.replace('\n', '').replace('\'', '"') == 'map_string_Test{1: Test { a: true b: 0 y: "abc"}, 2: Test { a: true b: 1 y: "def"}, 3: Test { a: false b: 2 y: "ghi"}}'
assert '$c' == '{"1": true, "2": false}'
d := {'f1': 1.1, 'f2': 2.2, 'f3': 3.3, 'f4': 4.4}
assert '$d' == '{"f1": 1.1, "f2": 2.2, "f3": 3.3, "f4": 4.4}'
mut e := map[string]Test
e['1'] = Test{true, 0, 'abc'}
e['2'] = Test{true, 1, 'def'}
e['3'] = Test{false, 2, 'ghi'}
s := '$e'
assert s.contains('{"1": Test {')
assert s.contains('a: true')
assert s.contains("y: 'abc'")
assert s.contains('}, "2": Test {')
assert s.contains("y: 'def'")
}