From e71370dc407d1bbb5fcf8914945b3d405b27c76a Mon Sep 17 00:00:00 2001 From: yuyi Date: Wed, 19 Jul 2023 02:08:43 +0800 Subject: [PATCH] cgen: format generated c codes of sorted structs (#18898) --- vlib/v/gen/c/cgen.v | 1 - vlib/v/gen/c/struct.v | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/vlib/v/gen/c/cgen.v b/vlib/v/gen/c/cgen.v index 438c55491315c4..e7d6d487e457b3 100644 --- a/vlib/v/gen/c/cgen.v +++ b/vlib/v/gen/c/cgen.v @@ -5868,7 +5868,6 @@ fn (mut g Gen) write_types(symbols []&ast.TypeSymbol) { } } g.type_definitions.writeln('};') - g.type_definitions.writeln('') } ast.ArrayFixed { elem_sym := g.table.sym(sym.info.elem_type) diff --git a/vlib/v/gen/c/struct.v b/vlib/v/gen/c/struct.v index d19d2edb792478..ad8ccc0702a6b5 100644 --- a/vlib/v/gen/c/struct.v +++ b/vlib/v/gen/c/struct.v @@ -517,8 +517,6 @@ fn (mut g Gen) struct_decl(s ast.Struct, name string, is_anon bool) { } else { g.type_definitions.writeln('\tEMPTY_STRUCT_DECLARATION;') } - // g.type_definitions.writeln('} $name;\n') - // ti_attrs := if !g.is_cc_msvc && s.attrs.contains('packed') { '__attribute__((__packed__))' } else { @@ -528,8 +526,10 @@ fn (mut g Gen) struct_decl(s ast.Struct, name string, is_anon bool) { if !is_anon { g.type_definitions.write_string(';') } - g.type_definitions.writeln('\n') - g.type_definitions.writeln(post_pragma) + g.type_definitions.writeln('') + if post_pragma.len > 0 { + g.type_definitions.writeln(post_pragma) + } } fn (mut g Gen) struct_init_field(sfield ast.StructInitField, language ast.Language) {