vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

gen: fix multi return optional

pull/4072/head
Joe Conigliaro 2020-03-19 22:13:17 +11:00
parent 97fbbac973
commit 79077b0025
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
vlib/v/gen/cgen.v
View File

@ -1298,17 +1298,22 @@ fn (g mut Gen) index_expr(node ast.IndexExpr) {
} }
fn (g mut Gen) return_statement(it ast.Return) { fn (g mut Gen) return_statement(it ast.Return) {
g.write('return') g.write('return ')
if g.fn_decl.name == 'main' { if g.fn_decl.name == 'main' {
g.writeln(' 0;') g.writeln('0;')
return return
} }
fn_return_is_optional := table.type_is_optional(g.fn_decl.return_type)
// multiple returns // multiple returns
if it.exprs.len > 1 { if it.exprs.len > 1 {
typ_sym := g.table.get_type_symbol(g.fn_decl.return_type) typ_sym := g.table.get_type_symbol(g.fn_decl.return_type)
mr_info := typ_sym.info as table.MultiReturn mr_info := typ_sym.info as table.MultiReturn
styp := g.typ(g.fn_decl.return_type) mut styp := g.typ(g.fn_decl.return_type)
g.write(' ($styp){') if fn_return_is_optional {
styp = styp[7..] // remove 'Option_'
g.write('opt_ok(& ($styp []) { ')
}
g.write('($styp){')
for i, expr in it.exprs { for i, expr in it.exprs {
g.write('.arg$i=') g.write('.arg$i=')
g.expr(expr) g.expr(expr)
@ -1317,12 +1322,14 @@ fn (g mut Gen) return_statement(it ast.Return) {
} }
} }
g.write('}') g.write('}')
if fn_return_is_optional {
g.writeln(' }, sizeof($styp));')
}
} }
// normal return // normal return
else if it.exprs.len == 1 { else if it.exprs.len == 1 {
g.write(' ')
// `return opt_ok(expr)` for functions that expect an optional // `return opt_ok(expr)` for functions that expect an optional
if table.type_is_optional(g.fn_decl.return_type) && !table.type_is_optional(it.types[0]) { if fn_return_is_optional && !table.type_is_optional(it.types[0]) {
mut is_none := false mut is_none := false
mut is_error := false mut is_error := false
expr0 := it.exprs[0] expr0 := it.exprs[0]