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

cgen: improve the stability of generated code for auto string methods

Browse Source
This commit is contained in:
Delyan Angelov 2025-03-11 13:28:04 +02:00
parent de54be058e
commit fe618a500b
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -284,6 +284,8 @@ fn (mut g Gen) gen_str_for_alias(info ast.Alias, styp string, str_fn_name string
g.auto_str_funcs.writeln('${g.static_non_parallel}string ${str_fn_name}(${arg_def}) { return indent_${str_fn_name}(it, 0); }')
g.definitions.writeln('${g.static_non_parallel}string indent_${str_fn_name}(${arg_def}, int indent_count); // auto')
g.auto_str_funcs.writeln('${g.static_non_parallel}string indent_${str_fn_name}(${arg_def}, int indent_count) {')
old := g.reset_tmp_count()
defer { g.tmp_count = old }
g.auto_str_funcs.writeln('\tstring indents = string_repeat(_SLIT(" "), indent_count);')
if str_method_expects_ptr {
it_arg := if is_c_struct { 'it' } else { '&it' }
@ -954,7 +956,8 @@ fn (mut g Gen) gen_str_for_struct(info ast.Struct, lang ast.Language, styp strin
g.auto_fn_definitions << fn_builder.str()
}
fn_builder.writeln('string indent_${str_fn_name}(${arg_def}, int indent_count) {')
old := g.reset_tmp_count()
defer { g.tmp_count = old }
clean_struct_v_type_name := if info.is_anon { 'struct ' } else { util.strip_main_name(typ_str) }
// generate ident / indent length = 4 spaces
if info.fields.len == 0 {

4
vlib/v/gen/c/cgen.v
View File

@ -2024,8 +2024,10 @@ pub fn (mut g Gen) current_tmp_var() string {
return prefix_with_counter('_t', g.tmp_count)
}
pub fn (mut g Gen) reset_tmp_count() {
pub fn (mut g Gen) reset_tmp_count() int {
old := g.tmp_count
g.tmp_count = 0
return old
}
fn (mut g Gen) decrement_inside_ternary() {