TheCloud/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-14 18:06:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

ast: cleanup in stringify_fn_after_name() (#22473)

Browse Source
This commit is contained in:
yuyi 2024-10-10 20:24:49 +08:00 committed by GitHub
parent d3b380b48b
commit a3f6fd5d2f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vlib/v/ast/str.v
View File

@ -153,9 +153,8 @@ fn (t &Table) stringify_fn_after_name(node &FnDecl, mut f strings.Builder, cur_m
if add_para_types { if add_para_types {
f.write_string('[') f.write_string('[')
for i, gname in node.generic_names { for i, gname in node.generic_names {
is_last := i == node.generic_names.len - 1
f.write_string(gname) f.write_string(gname)
if !is_last { if i != node.generic_names.len - 1 {
f.write_string(', ') f.write_string(', ')
} }
} }
@ -189,16 +188,15 @@ fn (t &Table) stringify_fn_after_name(node &FnDecl, mut f strings.Builder, cur_m
} }
f.write_string(param.name) f.write_string(param.name)
param_sym := t.sym(param.typ) param_sym := t.sym(param.typ)
if param_sym.kind == .struct && (param_sym.info as Struct).is_anon { if param_sym.info is Struct && param_sym.info.is_anon {
f.write_string(' struct {') f.write_string(' struct {')
struct_ := param_sym.info as Struct for field in param_sym.info.fields {
for field in struct_.fields {
f.write_string(' ${field.name} ${t.type_to_str(field.typ)}') f.write_string(' ${field.name} ${t.type_to_str(field.typ)}')
if field.has_default_expr { if field.has_default_expr {
f.write_string(' = ${field.default_expr}') f.write_string(' = ${field.default_expr}')
} }
} }
if struct_.fields.len > 0 { if param_sym.info.fields.len > 0 {
f.write_string(' ') f.write_string(' ')
} }
f.write_string('}') f.write_string('}')
@ -207,9 +205,9 @@ fn (t &Table) stringify_fn_after_name(node &FnDecl, mut f strings.Builder, cur_m
if param.is_mut { if param.is_mut {
if s.starts_with('&') && ((!param_sym.is_number() && param_sym.kind != .bool) if s.starts_with('&') && ((!param_sym.is_number() && param_sym.kind != .bool)
|| node.language != .v || node.language != .v
|| (param.typ.is_ptr() && t.sym(param.typ).kind == .struct)) { || (param.typ.is_ptr() && param_sym.kind == .struct)) {
s = s[1..] s = s[1..]
} else if param.typ.is_ptr() && t.sym(param.typ).kind == .struct && !s.contains('[') { } else if param.typ.is_ptr() && param_sym.kind == .struct && !s.contains('[') {
s = t.type_to_str(param.typ.clear_flag(.shared_f).deref()) s = t.type_to_str(param.typ.clear_flag(.shared_f).deref())
} }
} }