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

cgen: cleanup auto_str_methods (#12631)

pull/12638/head
yuyi 2021-12-01 01:39:55 +08:00 committed by GitHub
parent 5e1cd13e39
commit 547f326f33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -731,7 +731,7 @@ fn (mut g Gen) gen_str_for_map(info ast.Map, styp string, str_fn_name string) {
g.auto_str_funcs.writeln('}') g.auto_str_funcs.writeln('}')
} }
fn (g &Gen) type_to_fmt1(typ ast.Type) StrIntpType { fn (g &Gen) type_to_fmt(typ ast.Type) StrIntpType {
if typ == ast.byte_type_idx { if typ == ast.byte_type_idx {
return .si_u8 return .si_u8
} }
@ -813,7 +813,7 @@ fn (mut g Gen) gen_str_for_struct(info ast.Struct, styp string, str_fn_name stri
fn_body.writeln('\t\t{_SLIT("$clean_struct_v_type_name{\\n"), 0, {.d_c=0}},') fn_body.writeln('\t\t{_SLIT("$clean_struct_v_type_name{\\n"), 0, {.d_c=0}},')
for i, field in info.fields { for i, field in info.fields {
mut ptr_amp := if field.typ.is_ptr() { '&' } else { '' } mut ptr_amp := if field.typ.is_ptr() { '&' } else { '' }
base_fmt := g.type_to_fmt1(g.unwrap_generic(field.typ)) base_fmt := g.type_to_fmt(g.unwrap_generic(field.typ))
// manage prefix and quote symbol for the filed // manage prefix and quote symbol for the filed
mut quote_str := '' mut quote_str := ''
@ -852,7 +852,7 @@ fn (mut g Gen) gen_str_for_struct(info ast.Struct, styp string, str_fn_name stri
} }
mut funcprefix := '' mut funcprefix := ''
mut func, mut caller_should_free := struct_auto_str_func1(sym, field.typ, field_styp_fn_name, mut func, mut caller_should_free := struct_auto_str_func(sym, field.typ, field_styp_fn_name,
field.name, sym_has_str_method, str_method_expects_ptr) field.name, sym_has_str_method, str_method_expects_ptr)
if field.typ in ast.cptr_types { if field.typ in ast.cptr_types {
func = '(voidptr) it.$field.name' func = '(voidptr) it.$field.name'
@ -895,7 +895,7 @@ fn (mut g Gen) gen_str_for_struct(info ast.Struct, styp string, str_fn_name stri
fn_body.writeln('\t}));') fn_body.writeln('\t}));')
} }
fn struct_auto_str_func1(sym &ast.TypeSymbol, field_type ast.Type, fn_name string, field_name string, has_custom_str bool, expects_ptr bool) (string, bool) { fn struct_auto_str_func(sym &ast.TypeSymbol, field_type ast.Type, fn_name string, field_name string, has_custom_str bool, expects_ptr bool) (string, bool) {
deref, _ := deref_kind(expects_ptr, field_type.is_ptr(), field_type) deref, _ := deref_kind(expects_ptr, field_type.is_ptr(), field_type)
if sym.kind == .enum_ { if sym.kind == .enum_ {
return '${fn_name}(${deref}it.${c_name(field_name)})', true return '${fn_name}(${deref}it.${c_name(field_name)})', true

6
vlib/v/gen/js/auto_str_methods.v
View File

@ -639,7 +639,7 @@ fn (mut g JsGen) gen_str_for_map(info ast.Map, styp string, str_fn_name string)
g.definitions.writeln('}') g.definitions.writeln('}')
} }
fn (g &JsGen) type_to_fmt1(typ ast.Type) StrIntpType { fn (g &JsGen) type_to_fmt(typ ast.Type) StrIntpType {
if typ == ast.byte_type_idx { if typ == ast.byte_type_idx {
return .si_u8 return .si_u8
} }
@ -740,7 +740,7 @@ fn (mut g JsGen) gen_str_for_struct(info ast.Struct, styp string, str_fn_name st
g.get_str_fn(field.typ) g.get_str_fn(field.typ)
} }
mut func := struct_auto_str_func1(mut g, sym, field.typ, field_styp_fn_name, field.name) mut func := struct_auto_str_func(mut g, sym, field.typ, field_styp_fn_name, field.name)
if field.typ in ast.cptr_types { if field.typ in ast.cptr_types {
func = '(voidptr) it.$field.name' func = '(voidptr) it.$field.name'
} else if field.typ.is_ptr() { } else if field.typ.is_ptr() {
@ -775,7 +775,7 @@ fn (mut g JsGen) gen_str_for_struct(info ast.Struct, styp string, str_fn_name st
fn_builder.writeln('}') fn_builder.writeln('}')
} }
fn struct_auto_str_func1(mut g JsGen, sym &ast.TypeSymbol, field_type ast.Type, fn_name string, field_name string) string { fn struct_auto_str_func(mut g JsGen, sym &ast.TypeSymbol, field_type ast.Type, fn_name string, field_name string) string {
has_custom_str, expects_ptr, _ := sym.str_method_info() has_custom_str, expects_ptr, _ := sym.str_method_info()
if sym.kind == .enum_ { if sym.kind == .enum_ {
return '${fn_name}(it.${g.js_name(field_name)})' return '${fn_name}(it.${g.js_name(field_name)})'