mirrors/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-13 22:42:26 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

checker: fix checking for option matching with non-option (#20673)

Browse source
This commit is contained in:
Felipe Pena 2024-01-28 22:32:39 -03:00 • committed by GitHub
parent a327d49e8a
commit d8b158be2b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
vlib/v/checker/match.v
View file

@ -55,6 +55,10 @@ fn (mut c Checker) match_expr(mut node ast.MatchExpr) ast.Type {
branch.branch_pos) branch.branch_pos)
} }
} }
if !branch.is_else && cond_is_option && branch.exprs[0] !is ast.None {
c.error('`match` expression with Option type only checks against `none`, to match its value you must unwrap it first `var?`',
branch.pos)
}
// If the last statement is an expression, return its type // If the last statement is an expression, return its type
if branch.stmts.len > 0 { if branch.stmts.len > 0 {
mut stmt := branch.stmts.last() mut stmt := branch.stmts.last()
@ -63,10 +67,6 @@ fn (mut c Checker) match_expr(mut node ast.MatchExpr) ast.Type {
c.expected_type = node.expected_type c.expected_type = node.expected_type
} }
expr_type := c.expr(mut stmt.expr) expr_type := c.expr(mut stmt.expr)
if !branch.is_else && cond_is_option && branch.exprs[0] !is ast.None {
c.error('`match` expression with Option type only checks against `none`, to match its value you must unwrap it first `var?`',
branch.pos)
}
stmt.typ = expr_type stmt.typ = expr_type
if first_iteration { if first_iteration {
if node.is_expr && (node.expected_type.has_flag(.option) if node.is_expr && (node.expected_type.has_flag(.option)

21
vlib/v/checker/tests/option_fn_err.out
View file

@ -3,21 +3,21 @@ vlib/v/checker/tests/option_fn_err.vv:34:16: error: cannot use `?int` as `int`,
33 | _ := bar(0) 33 | _ := bar(0)
34 | println(twice(bar(0))) 34 | println(twice(bar(0)))
| ~~~~~~ | ~~~~~~
35 | 35 |
36 | // anon fn 36 | // anon fn
vlib/v/checker/tests/option_fn_err.vv:37:16: error: cannot use `?int` as `int`, it must be unwrapped first in argument 1 to `anon` vlib/v/checker/tests/option_fn_err.vv:37:16: error: cannot use `?int` as `int`, it must be unwrapped first in argument 1 to `anon`
35 | 35 |
36 | // anon fn 36 | // anon fn
37 | fn (_ int) {}(bar(0)) 37 | fn (_ int) {}(bar(0))
| ~~~~~~ | ~~~~~~
38 | 38 |
39 | // assert 39 | // assert
vlib/v/checker/tests/option_fn_err.vv:40:9: error: assert can be used only with `bool` expressions, but found `bool` instead vlib/v/checker/tests/option_fn_err.vv:40:9: error: assert can be used only with `bool` expressions, but found `bool` instead
38 | 38 |
39 | // assert 39 | // assert
40 | assert bar(true) 40 | assert bar(true)
| ~~~~~~~~~ | ~~~~~~~~~
41 | 41 |
42 | // struct 42 | // struct
vlib/v/checker/tests/option_fn_err.vv:45:3: error: cannot assign an Option value to a non-option struct field vlib/v/checker/tests/option_fn_err.vv:45:3: error: cannot assign an Option value to a non-option struct field
43 | mut v := Data{ 43 | mut v := Data{
@ -38,7 +38,7 @@ vlib/v/checker/tests/option_fn_err.vv:49:6: error: cannot use `?int` as `int`, i
48 | v.add(bar(0)) // call method 48 | v.add(bar(0)) // call method
49 | v.f(bar(0)) // call fn field 49 | v.f(bar(0)) // call fn field
| ~~~~~~ | ~~~~~~
50 | 50 |
51 | // array 51 | // array
vlib/v/checker/tests/option_fn_err.vv:53:6: error: unwrapped Option cannot be used in an infix expression vlib/v/checker/tests/option_fn_err.vv:53:6: error: unwrapped Option cannot be used in an infix expression
51 | // array 51 | // array
@ -115,5 +115,12 @@ vlib/v/checker/tests/option_fn_err.vv:69:18: error: type mismatch, `bar` must re
68 | println(arr.any(bar(true))) 68 | println(arr.any(bar(true)))
69 | println(arr.all(bar(true))) 69 | println(arr.all(bar(true)))
| ~~~~~~~~~ | ~~~~~~~~~
70 | 70 |
71 | match bar(0) { 71 | match bar(0) {
vlib/v/checker/tests/option_fn_err.vv:72:3: error: `match` expression with Option type only checks against `none`, to match its value you must unwrap it first `var?`
70 |
71 | match bar(0) {
72 | 0 {}
| ^
73 | else {}
74 | }