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

checker: simplify checking array.contains() argument (#14133)

yuyi 2022-04-23 03:34:13 +08:00 committed by Jef Roosens
parent 0a30a90924
commit 0b7c3a6035
Signed by: Jef Roosens
GPG Key ID: B75D4F293C7052DB
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1927,13 +1927,10 @@ fn (mut c Checker) array_builtin_method_call(mut node ast.CallExpr, left_type as
// c.warn('use `value in arr` instead of `arr.contains(value)`', node.pos) // c.warn('use `value in arr` instead of `arr.contains(value)`', node.pos)
if node.args.len != 1 { if node.args.len != 1 {
c.error('`.contains()` expected 1 argument, but got $node.args.len', node.pos) c.error('`.contains()` expected 1 argument, but got $node.args.len', node.pos)
} else { } else if !left_sym.has_method('contains') {
arg_typ := ast.mktyp(c.expr(node.args[0].expr)) arg_typ := c.expr(node.args[0].expr)
elem_typ_str := c.table.type_to_str(elem_typ) c.check_expected_call_arg(arg_typ, elem_typ, node.language, node.args[0]) or {
arg_typ_str := c.table.type_to_str(arg_typ) c.error('$err.msg() in argument 1 to `.contains()`', node.args[0].pos)
if !left_sym.has_method('contains') && elem_typ_str != arg_typ_str {
c.error('`.contains()` expected `$elem_typ_str` argument, but got `$arg_typ_str`',
node.pos)
} }
} }
node.return_type = ast.bool_type node.return_type = ast.bool_type

12
vlib/v/checker/tests/array_contains_args_err.out
View File

@ -1,8 +1,8 @@
vlib/v/checker/tests/array_contains_args_err.vv:3:17: error: `.contains()` expected `int` argument, but got `[]int` vlib/v/checker/tests/array_contains_args_err.vv:3:26: error: cannot use `[]int` as `int` in argument 1 to `.contains()`
1 | fn main() { 1 | fn main() {
2 | arr := [0] 2 | arr := [0]
3 | mut ret := [0].contains([0]) 3 | mut ret := [0].contains([0])
| ~~~~~~~~~~~~~ | ~~~
4 | ret = [0].contains() 4 | ret = [0].contains()
5 | ret = [0, 1, 2].contains(0, 1, 2) 5 | ret = [0, 1, 2].contains(0, 1, 2)
vlib/v/checker/tests/array_contains_args_err.vv:4:12: error: `.contains()` expected 1 argument, but got 0 vlib/v/checker/tests/array_contains_args_err.vv:4:12: error: `.contains()` expected 1 argument, but got 0
@ -19,17 +19,17 @@ vlib/v/checker/tests/array_contains_args_err.vv:5:18: error: `.contains()` expec
| ~~~~~~~~~~~~~~~~~ | ~~~~~~~~~~~~~~~~~
6 | ret = [0].contains('a') 6 | ret = [0].contains('a')
7 | ret = [0].contains(arr) 7 | ret = [0].contains(arr)
vlib/v/checker/tests/array_contains_args_err.vv:6:12: error: `.contains()` expected `int` argument, but got `string` vlib/v/checker/tests/array_contains_args_err.vv:6:21: error: cannot use `string` as `int` in argument 1 to `.contains()`
4 | ret = [0].contains() 4 | ret = [0].contains()
5 | ret = [0, 1, 2].contains(0, 1, 2) 5 | ret = [0, 1, 2].contains(0, 1, 2)
6 | ret = [0].contains('a') 6 | ret = [0].contains('a')
| ~~~~~~~~~~~~~ | ~~~
7 | ret = [0].contains(arr) 7 | ret = [0].contains(arr)
8 | println(ret) 8 | println(ret)
vlib/v/checker/tests/array_contains_args_err.vv:7:12: error: `.contains()` expected `int` argument, but got `[]int` vlib/v/checker/tests/array_contains_args_err.vv:7:21: error: cannot use `[]int` as `int` in argument 1 to `.contains()`
5 | ret = [0, 1, 2].contains(0, 1, 2) 5 | ret = [0, 1, 2].contains(0, 1, 2)
6 | ret = [0].contains('a') 6 | ret = [0].contains('a')
7 | ret = [0].contains(arr) 7 | ret = [0].contains(arr)
| ~~~~~~~~~~~~~ | ~~~
8 | println(ret) 8 | println(ret)
9 | } 9 | }