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

cgen: fix assert checking fn option ret with none (#21726)

Browse Source
This commit is contained in:
Felipe Pena 2024-06-25 19:17:57 -03:00 committed by GitHub
parent a36c0d8315
commit fd384dff48
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2045,8 +2045,10 @@ fn (mut g Gen) expr_with_tmp_var(expr ast.Expr, expr_typ ast.Type, ret_typ ast.T
}
} else {
simple_assign =
(expr is ast.SelectorExpr || (expr is ast.Ident && !expr.is_auto_heap()))
&& ret_typ.is_ptr() && expr_typ.is_ptr() && expr_typ.has_flag(.option)
((expr is ast.SelectorExpr || (expr is ast.Ident && !expr.is_auto_heap()))
&& ret_typ.is_ptr() && expr_typ.is_ptr() && expr_typ.has_flag(.option))
|| (expr_typ == ret_typ && !(expr_typ.has_option_or_result()
&& (expr_typ.is_ptr() || expr is ast.LambdaExpr)))
// option ptr assignment simplification
if simple_assign {
g.write('${tmp_var} = ')

1
vlib/v/gen/c/ctempvars.v
View File

@ -22,4 +22,5 @@ fn (mut g Gen) gen_ctemp_var(tvar ast.CTempVar) {
g.write('${styp} ${tvar.name} = ')
g.expr(tvar.orig)
g.writeln(';')
g.set_current_pos_as_last_stmt_pos()
}

8
vlib/v/tests/assert_fn_ret_option_test.v Normal file
View File

@ -0,0 +1,8 @@
fn find_token_by_id() ?int {
return none
}
fn test_main() {
assert find_token_by_id() == none
println('done')
}