mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

cgen: fix result or option of multi return (fix #16873) (#16915)

Browse Source
This commit is contained in:
yuyi 2023-01-09 22:20:15 +08:00 committed by GitHub
parent 286350aa9b
commit c2eb4d7065
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
vlib/v/gen/c/assign.v
View File

@ -521,7 +521,6 @@ fn (mut g Gen) assign_stmt(node_ ast.AssignStmt) {
fn (mut g Gen) gen_multi_return_assign(node &ast.AssignStmt, return_type ast.Type) {
// multi return
// TODO Handle in if_expr
is_opt := return_type.has_flag(.option) || return_type.has_flag(.result)
mr_var_name := 'mr_${node.pos.pos}'
mr_styp := g.typ(return_type.clear_flag(.option).clear_flag(.result))
g.write('${mr_styp} ${mr_var_name} = ')
@ -551,34 +550,16 @@ fn (mut g Gen) gen_multi_return_assign(node &ast.AssignStmt, return_type ast.Typ
g.expr(lx)
noscan := if is_auto_heap { g.check_noscan(return_type) } else { '' }
if g.is_arraymap_set {
if is_opt {
mr_base_styp := g.base_type(return_type)
if is_auto_heap {
g.writeln('HEAP${noscan}(${mr_base_styp}, ${mr_var_name}.arg${i}) });')
} else {
g.writeln('${mr_var_name}.arg${i} });')
}
if is_auto_heap {
g.writeln('HEAP${noscan}(${styp}, ${mr_var_name}.arg${i}) });')
} else {
if is_auto_heap {
g.writeln('HEAP${noscan}(${styp}, ${mr_var_name}.arg${i}) });')
} else {
g.writeln('${mr_var_name}.arg${i} });')
}
g.writeln('${mr_var_name}.arg${i} });')
}
} else {
if is_opt {
mr_base_styp := g.base_type(return_type)
if is_auto_heap {
g.writeln(' = HEAP${noscan}(${mr_base_styp}, ${mr_var_name}.arg${i});')
} else {
g.writeln(' = ${mr_var_name}.arg${i};')
}
if is_auto_heap {
g.writeln(' = HEAP${noscan}(${styp}, ${mr_var_name}.arg${i});')
} else {
if is_auto_heap {
g.writeln(' = HEAP${noscan}(${styp}, ${mr_var_name}.arg${i});')
} else {
g.writeln(' = ${mr_var_name}.arg${i};')
}
g.writeln(' = ${mr_var_name}.arg${i};')
}
}
}

15
vlib/v/tests/multiret_with_result_test.v Normal file
View File

@ -0,0 +1,15 @@
[heap]
struct Foo {
a string
b int
}
fn ret() !(int, Foo) {
return 0, Foo{}
}
fn test_multiret_with_result() {
_, foo := ret()!
println(foo)
assert true
}