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

cgen: multi return optional fix

pull/4077/head
joe-conigliaro 2020-03-20 14:59:06 +11:00
parent 525639b42f
commit 1fb2c3f5b4
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -385,9 +385,18 @@ fn (g mut Gen) gen_assign_stmt(assign_stmt ast.AssignStmt) {
} }
} }
mr_var_name := 'mr_$assign_stmt.pos.pos' mr_var_name := 'mr_$assign_stmt.pos.pos'
mr_typ_str := g.typ(return_type) if table.type_is_optional(return_type) {
g.write('$mr_typ_str $mr_var_name = ') return_type = table.type_clear_extra(return_type)
mr_styp := g.typ(return_type)
g.write('$mr_styp $mr_var_name = (*(${mr_styp}*)')
g.expr(assign_stmt.right[0]) g.expr(assign_stmt.right[0])
g.write('.data)')
}
else {
mr_styp := g.typ(return_type)
g.write('$mr_styp $mr_var_name = ')
g.expr(assign_stmt.right[0])
}
g.writeln(';') g.writeln(';')
for i, ident in assign_stmt.left { for i, ident in assign_stmt.left {
if ident.kind == .blank_ident { if ident.kind == .blank_ident {