checker: disallow invalid expr for filter, count, any, all (fix #24508) (#24540)

Delta456 · web-flow · commit be49e2bf6c9c · 2025-05-21T14:00:20.000+03:00
diff --git a/vlib/v/checker/fn.v b/vlib/v/checker/fn.v
@@ -2983,8 +2983,8 @@ fn (mut c Checker) check_predicate_param(is_map bool, elem_typ ast.Type, node as
 		// Finish early so that it doesn't fail later
 		return
 	}
-	arg_expr := node.args[0].expr
-	match arg_expr {
+	mut arg_expr := node.args[0].expr
+	match mut arg_expr {
 		ast.AnonFn {
 			if arg_expr.decl.return_type.has_flag(.option) {
 				c.error('option needs to be unwrapped before using it in map/filter',
@@ -3024,7 +3024,7 @@ fn (mut c Checker) check_predicate_param(is_map bool, elem_typ ast.Type, node as
 						arg_expr.pos)
 				}
 			} else if arg_expr.kind == .variable {
-				if arg_expr.obj is ast.Var {
+				if mut arg_expr.obj is ast.Var {
 					expr := arg_expr.obj.expr
 					if expr is ast.AnonFn {
 						// copied from above
@@ -3084,13 +3084,18 @@ fn (mut c Checker) check_predicate_param(is_map bool, elem_typ ast.Type, node as
 			}
 		}
 		ast.LambdaExpr {
-			if arg_expr.expr is ast.CallExpr && is_map
+			if mut arg_expr.expr is ast.CallExpr && is_map
 				&& arg_expr.expr.return_type in [ast.void_type, 0] {
 				c.error('type mismatch, `${arg_expr.expr.name}` does not return anything',
 					arg_expr.expr.pos)
 			}
 		}
-		else {}
+		else {
+			if !is_map && c.expr(mut arg_expr) != ast.bool_type {
+				c.error('invalid expression, expected infix expr, lambda or function',
+					arg_expr.pos())
+			}
+		}
 	}
 }
 
diff --git a/vlib/v/checker/tests/array_count_err.out b/vlib/v/checker/tests/array_count_err.out
@@ -1,3 +1,10 @@
+vlib/v/checker/tests/array_count_err.vv:3:10: error: invalid expression, expected infix expr, lambda or function
+    1 | fn main() {
+    2 |     a := []int{}
+    3 |     a.count(1)
+      |             ^
+    4 |     a.count(1, 2)
+    5 |     a.count('')
 vlib/v/checker/tests/array_count_err.vv:4:4: error: expected 1 argument, but got 2
     2 |     a := []int{}
     3 |     a.count(1)
diff --git a/vlib/v/checker/tests/array_method_invalid_expr.out b/vlib/v/checker/tests/array_method_invalid_expr.out
@@ -0,0 +1,24 @@
+vlib/v/checker/tests/array_method_invalid_expr.vv:2:16: error: invalid expression, expected infix expr, lambda or function
+    1 | runes := [`a`, `b`, `c`, `a`]
+    2 | dump(runes.all(`a`))
+      |                ~~~
+    3 | dump(runes.any(`a`))
+    4 | dump(runes.count(`a`))
+vlib/v/checker/tests/array_method_invalid_expr.vv:3:16: error: invalid expression, expected infix expr, lambda or function
+    1 | runes := [`a`, `b`, `c`, `a`]
+    2 | dump(runes.all(`a`))
+    3 | dump(runes.any(`a`))
+      |                ~~~
+    4 | dump(runes.count(`a`))
+    5 | dump(runes.filter(`a`))
+vlib/v/checker/tests/array_method_invalid_expr.vv:4:18: error: invalid expression, expected infix expr, lambda or function
+    2 | dump(runes.all(`a`))
+    3 | dump(runes.any(`a`))
+    4 | dump(runes.count(`a`))
+      |                  ~~~
+    5 | dump(runes.filter(`a`))
+vlib/v/checker/tests/array_method_invalid_expr.vv:5:19: error: invalid expression, expected infix expr, lambda or function
+    3 | dump(runes.any(`a`))
+    4 | dump(runes.count(`a`))
+    5 | dump(runes.filter(`a`))
+      |                   ~~~
diff --git a/vlib/v/checker/tests/array_method_invalid_expr.vv b/vlib/v/checker/tests/array_method_invalid_expr.vv
@@ -0,0 +1,5 @@
+runes := [`a`, `b`, `c`, `a`]
+dump(runes.all(`a`))
+dump(runes.any(`a`))
+dump(runes.count(`a`))
+dump(runes.filter(`a`))
diff --git a/vlib/v/checker/tests/fixed_array_builtin_method_args_err.out b/vlib/v/checker/tests/fixed_array_builtin_method_args_err.out
@@ -33,6 +33,13 @@ vlib/v/checker/tests/fixed_array_builtin_method_args_err.vv:8:11: error: `.any`
       |              ~~~~~
     9 |     _ := arr.any(22)
    10 |     _ := arr.all()
+vlib/v/checker/tests/fixed_array_builtin_method_args_err.vv:9:15: error: invalid expression, expected infix expr, lambda or function
+    7 |     _ := arr.contains('hello')
+    8 |     _ := arr.any()
+    9 |     _ := arr.any(22)
+      |                  ~~
+   10 |     _ := arr.all()
+   11 |     _ := arr.all('hello')
 vlib/v/checker/tests/fixed_array_builtin_method_args_err.vv:10:11: error: `.all` expected 1 argument, but got 0
     8 |     _ := arr.any()
     9 |     _ := arr.any(22)
diff --git a/vlib/v/pref/pref.v b/vlib/v/pref/pref.v
@@ -987,7 +987,7 @@ pub fn parse_args_and_show_errors(known_external_commands []string, args []strin
 						dyld_fallback_paths := os.getenv('DYLD_FALLBACK_LIBRARY_PATH')
 						so_dir := os.dir(so_path)
 						if !dyld_fallback_paths.contains(so_dir) {
-							env := [dyld_fallback_paths, so_dir].filter(it.len).join(':')
+							env := [dyld_fallback_paths, so_dir].filter(it.len != 0).join(':')
 							os.setenv('DYLD_FALLBACK_LIBRARY_PATH', env, true)
 						}
 					}
diff --git a/vlib/v/reflection/reflection.v b/vlib/v/reflection/reflection.v
@@ -254,7 +254,7 @@ pub fn get_modules() []Module {
 // get_functions returns the functions built with V source
 pub fn get_funcs() []Function {
 	mut out := g_reflection.funcs.clone()
-	out << arrays.flatten[Function](get_types().map(it.sym.methods).filter(it.len))
+	out << arrays.flatten[Function](get_types().map(it.sym.methods).filter(it.len != 0))
 	return out
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2983,8 +2983,8 @@ fn (mut c Checker) check_predicate_param(is_map bool, elem_typ ast.Type, node as`
`2983`	`2983`	`// Finish early so that it doesn't fail later`
`2984`	`2984`	`return`
`2985`	`2985`	`}`
`2986`		`- arg_expr := node.args[0].expr`
`2987`		`- match arg_expr {`
	`2986`	`+ mut arg_expr := node.args[0].expr`
	`2987`	`+ match mut arg_expr {`
`2988`	`2988`	`ast.AnonFn {`
`2989`	`2989`	`if arg_expr.decl.return_type.has_flag(.option) {`
`2990`	`2990`	`c.error('option needs to be unwrapped before using it in map/filter',`
`@@ -3024,7 +3024,7 @@ fn (mut c Checker) check_predicate_param(is_map bool, elem_typ ast.Type, node as`
`3024`	`3024`	`arg_expr.pos)`
`3025`	`3025`	`}`
`3026`	`3026`	`} else if arg_expr.kind == .variable {`
`3027`		`- if arg_expr.obj is ast.Var {`
	`3027`	`+ if mut arg_expr.obj is ast.Var {`
`3028`	`3028`	`expr := arg_expr.obj.expr`
`3029`	`3029`	`if expr is ast.AnonFn {`
`3030`	`3030`	`// copied from above`
`@@ -3084,13 +3084,18 @@ fn (mut c Checker) check_predicate_param(is_map bool, elem_typ ast.Type, node as`
`3084`	`3084`	`}`
`3085`	`3085`	`}`
`3086`	`3086`	`ast.LambdaExpr {`
`3087`		`- if arg_expr.expr is ast.CallExpr && is_map`
	`3087`	`+ if mut arg_expr.expr is ast.CallExpr && is_map`
`3088`	`3088`	`&& arg_expr.expr.return_type in [ast.void_type, 0] {`
`3089`	`3089`	c.error('type mismatch, `${arg_expr.expr.name}` does not return anything',
`3090`	`3090`	`arg_expr.expr.pos)`
`3091`	`3091`	`}`
`3092`	`3092`	`}`
`3093`		`- else {}`
	`3093`	`+ else {`
	`3094`	`+ if !is_map && c.expr(mut arg_expr) != ast.bool_type {`
	`3095`	`+ c.error('invalid expression, expected infix expr, lambda or function',`
	`3096`	`+ arg_expr.pos())`
	`3097`	`+ }`
	`3098`	`+ }`
`3094`	`3099`	`}`
`3095`	`3100`	`}`
`3096`	`3101`
Original file line number	Diff line number	Diff line change
`@@ -987,7 +987,7 @@ pub fn parse_args_and_show_errors(known_external_commands []string, args []strin`
`987`	`987`	`dyld_fallback_paths := os.getenv('DYLD_FALLBACK_LIBRARY_PATH')`
`988`	`988`	`so_dir := os.dir(so_path)`
`989`	`989`	`if !dyld_fallback_paths.contains(so_dir) {`
`990`		`- env := [dyld_fallback_paths, so_dir].filter(it.len).join(':')`
	`990`	`+ env := [dyld_fallback_paths, so_dir].filter(it.len != 0).join(':')`
`991`	`991`	`os.setenv('DYLD_FALLBACK_LIBRARY_PATH', env, true)`
`992`	`992`	`}`
`993`	`993`	`}`
Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ pub fn get_modules() []Module {`
`254`	`254`	`// get_functions returns the functions built with V source`
`255`	`255`	`pub fn get_funcs() []Function {`
`256`	`256`	`mut out := g_reflection.funcs.clone()`
`257`		`- out << arrays.flatten[Function](get_types().map(it.sym.methods).filter(it.len))`
	`257`	`+ out << arrays.flatten[Function](get_types().map(it.sym.methods).filter(it.len != 0))`
`258`	`258`	`return out`
`259`	`259`	`}`
`260`	`260`