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

checker: improve error message for: `a := foo() or { println(err) }` (#6710)

pull/6713/head
pancake 2020-11-02 03:52:35 +01:00 committed by GitHub
parent 613d6c043b
commit d040af4939
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vlib/v/checker/checker.v
View File

@ -1654,10 +1654,15 @@ pub fn (mut c Checker) check_or_expr(or_expr ast.OrExpr, ret_type table.Type) {
if type_fits || is_panic_or_exit { if type_fits || is_panic_or_exit {
return return
} }
type_name := c.table.type_to_str(last_stmt.typ)
expected_type_name := c.table.type_to_str(ret_type.clear_flag(.optional)) expected_type_name := c.table.type_to_str(ret_type.clear_flag(.optional))
c.error('wrong return type `$type_name` in the `or {}` block, expected `$expected_type_name`', if last_stmt.typ == table.void_type {
last_stmt.pos) c.error('`or` block must provide a default value of type `$expected_type_name`, or return/exit/continue/break/panic',
last_stmt.pos)
} else {
type_name := c.table.type_to_str(last_stmt.typ)
c.error('wrong return type `$type_name` in the `or {}` block, expected `$expected_type_name`',
last_stmt.pos)
}
return return
} }
ast.BranchStmt { ast.BranchStmt {