From cc250baf3cc24eed1cb7709ded1eede9285997cc Mon Sep 17 00:00:00 2001 From: shove Date: Sun, 31 Dec 2023 13:04:41 +0800 Subject: [PATCH] cgen: fix missing line breaks in generated code with closure IIFE, when compiled with '-g' (fix #20306) (#20316) --- examples/viewer/view.v | 8 ++++---- examples/viewer/zip_container.v | 2 +- vlib/v/gen/c/fn.v | 3 +++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/examples/viewer/view.v b/examples/viewer/view.v index d9f6f66640..499ae6017b 100644 --- a/examples/viewer/view.v +++ b/examples/viewer/view.v @@ -16,7 +16,7 @@ import sokol.gfx import sokol.sgl import sokol.sapp import stbi -import szip +import compress.szip import strings // Help text @@ -801,10 +801,10 @@ fn main() { // App init mut app := &App{ - gg: 0 + gg: unsafe { nil } // zip fields - zip: 0 - item_list: 0 + zip: unsafe { nil } + item_list: unsafe { nil } } app.state = .scanning diff --git a/examples/viewer/zip_container.v b/examples/viewer/zip_container.v index 43f2809a8b..d61f463944 100644 --- a/examples/viewer/zip_container.v +++ b/examples/viewer/zip_container.v @@ -9,7 +9,7 @@ * TODO: **********************************************************************/ import sokol.gfx -import szip +import compress.szip fn (mut il Item_list) scan_zip(path string, in_index int) ! { println('Scanning ZIP [${path}]') diff --git a/vlib/v/gen/c/fn.v b/vlib/v/gen/c/fn.v index 1d24d633ca..66969994e8 100644 --- a/vlib/v/gen/c/fn.v +++ b/vlib/v/gen/c/fn.v @@ -701,6 +701,9 @@ fn (mut g Gen) call_expr(node ast.CallExpr) { g.expr(node.left) g.writeln(';') g.write(line) + if g.out.last_n(1) != '\n' { + g.writeln('') + } g.write(tmp_var) } else if node.or_block.kind == .absent { g.expr(node.left)