cgen: fix const x := opt() or {} side effect interference when the consts are in different files in the same module too

spytheman · spytheman · commit b576181a661e · 2021-11-19T19:02:33.000+02:00
diff --git a/vlib/v/gen/c/cgen.v b/vlib/v/gen/c/cgen.v
@@ -5833,7 +5833,9 @@ fn (mut g Gen) const_decl_init_later(mod string, name string, expr ast.Expr, typ
 		}
 	} else {
 		if unwrap_option {
+			g.init.writeln('{')
 			g.init.writeln(g.expr_string_surround('\t$cname = *($styp*)', expr, '.data;'))
+			g.init.writeln('}')
 		} else {
 			g.init.writeln(g.expr_string_surround('\t$cname = ', expr, ';'))
 		}

Original file line number	Diff line number	Diff line change
`@@ -5833,7 +5833,9 @@ fn (mut g Gen) const_decl_init_later(mod string, name string, expr ast.Expr, typ`
`5833`	`5833`	`}`
`5834`	`5834`	`} else {`
`5835`	`5835`	`if unwrap_option {`
	`5836`	`+ g.init.writeln('{')`
`5836`	`5837`	`g.init.writeln(g.expr_string_surround('\t$cname = ($styp)', expr, '.data;'))`
	`5838`	`+ g.init.writeln('}')`
`5837`	`5839`	`} else {`
`5838`	`5840`	`g.init.writeln(g.expr_string_surround('\t$cname = ', expr, ';'))`
`5839`	`5841`	`}`