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

checker: error when trying to propagate optional call in return stmt with ?

pull/7644/head
Joe Conigliaro 2020-12-28 20:09:43 +11:00
parent ae5cfa70e9
commit 64c0645bcb
No known key found for this signature in database
GPG Key ID: C12F7136C08206F1
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vlib/v/checker/checker.v
View File

@ -2028,6 +2028,14 @@ pub fn (mut c Checker) return_stmt(mut return_stmt ast.Return) {
pos) pos)
} }
} }
if exp_is_optional && return_stmt.exprs.len > 0 {
expr0 := return_stmt.exprs[0]
if expr0 is ast.CallExpr {
if expr0.or_block.kind == .propagate {
c.error('`?` is not needed, use `return ${expr0.name}()`', expr0.pos)
}
}
}
} }
pub fn (mut c Checker) const_decl(mut node ast.ConstDecl) { pub fn (mut c Checker) const_decl(mut node ast.ConstDecl) {

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

@ -4101,7 +4101,7 @@ fn (mut g Gen) return_statement(node ast.Return) {
} }
} }
// regular cases // regular cases
if fn_return_is_multi { // not_optional_none { //&& !fn_return_is_optional { if fn_return_is_multi && node.exprs.len > 0 && !g.expr_is_multi_return_call(node.exprs[0]) { // not_optional_none { //&& !fn_return_is_optional {
// 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
mut styp := '' mut styp := ''
@ -4182,7 +4182,12 @@ fn (mut g Gen) return_statement(node ast.Return) {
// normal return // normal return
return_sym := g.table.get_type_symbol(node.types[0]) return_sym := g.table.get_type_symbol(node.types[0])
// `return opt_ok(expr)` for functions that expect an optional // `return opt_ok(expr)` for functions that expect an optional
if fn_return_is_optional && !node.types[0].has_flag(.optional) && return_sym.name != 'Option' { mut expr_type_is_opt := node.types[0].has_flag(.optional)
expr0 := node.exprs[0]
if expr0 is ast.CallExpr {
expr_type_is_opt = expr0.return_type.has_flag(.optional)
}
if fn_return_is_optional && !expr_type_is_opt && return_sym.name != 'Option' {
styp := g.base_type(g.fn_decl.return_type) styp := g.base_type(g.fn_decl.return_type)
opt_type := g.typ(g.fn_decl.return_type) opt_type := g.typ(g.fn_decl.return_type)
// Create a tmp for this option // Create a tmp for this option