parser,fmt,checker: use a trie for matching the generic array methods all, any, count, filter, map, sort and sorted (#25759)

spytheman · web-flow · commit aae3ba895732 · 2025-11-19T06:43:02.000+02:00
diff --git a/vlib/v/ast/types.v b/vlib/v/ast/types.v
@@ -798,6 +798,12 @@ pub const voidptr_types = new_voidptr_types()
 pub const cptr_types = merge_types(voidptr_types, byteptr_types, charptr_types)
 pub const nil_type = new_type(nil_type_idx)
 
+pub const builtin_array_generic_methods = ['all', 'any', 'count', 'filter', 'map', 'sort', 'sorted']
+pub const builtin_array_generic_methods_matcher = token.new_keywords_matcher_from_array_trie(builtin_array_generic_methods)
+
+pub const builtin_array_generic_methods_no_sort = ['all', 'any', 'count', 'filter', 'map']
+pub const builtin_array_generic_methods_no_sort_matcher = token.new_keywords_matcher_from_array_trie(builtin_array_generic_methods_no_sort)
+
 fn new_charptr_types() []Type {
 	return [charptr_type, new_type(char_type_idx).set_nr_muls(1)]
 }
diff --git a/vlib/v/checker/fn.v b/vlib/v/checker/fn.v
@@ -3306,7 +3306,7 @@ fn (mut c Checker) array_builtin_method_call(mut node ast.CallExpr, left_type as
 	elem_typ = array_info.elem_type
 	node_args_len := node.args.len
 	mut arg0 := if node_args_len > 0 { node.args[0] } else { ast.CallArg{} }
-	if method_name in ['filter', 'map', 'any', 'all', 'count'] {
+	if ast.builtin_array_generic_methods_no_sort_matcher.matches(method_name) {
 		if node_args_len > 0 && mut arg0.expr is ast.LambdaExpr {
 			if arg0.expr.params.len != 1 {
 				c.error('lambda expressions used in the builtin array methods require exactly 1 parameter',
diff --git a/vlib/v/fmt/fmt.v b/vlib/v/fmt/fmt.v
@@ -2053,7 +2053,7 @@ fn (mut f Fmt) write_static_method(name string, short_name string) {
 pub fn (mut f Fmt) call_expr(node ast.CallExpr) {
 	mut is_method_newline := false
 	if node.is_method {
-		if node.name in ['map', 'filter', 'all', 'any', 'count'] {
+		if ast.builtin_array_generic_methods_no_sort_matcher.matches(node.name) {
 			f.in_lambda_depth++
 			defer(fn) { f.in_lambda_depth-- }
 		}
diff --git a/vlib/v/parser/parser.v b/vlib/v/parser/parser.v
@@ -2186,8 +2186,7 @@ fn (mut p Parser) dot_expr(left ast.Expr) ast.Expr {
 	} else {
 		p.name_error = true
 	}
-	is_filter := field_name in ['filter', 'map', 'any', 'all', 'count']
-	if is_filter || field_name == 'sort' || field_name == 'sorted' {
+	if ast.builtin_array_generic_methods_matcher.matches(field_name) {
 		if p.file_backend_mode == .v || p.file_backend_mode == .c {
 			p.register_auto_import('builtin.closure')
 		}

Original file line number	Diff line number	Diff line change
`@@ -2053,7 +2053,7 @@ fn (mut f Fmt) write_static_method(name string, short_name string) {`
`2053`	`2053`	`pub fn (mut f Fmt) call_expr(node ast.CallExpr) {`
`2054`	`2054`	`mut is_method_newline := false`
`2055`	`2055`	`if node.is_method {`
`2056`		`- if node.name in ['map', 'filter', 'all', 'any', 'count'] {`
	`2056`	`+ if ast.builtin_array_generic_methods_no_sort_matcher.matches(node.name) {`
`2057`	`2057`	`f.in_lambda_depth++`
`2058`	`2058`	`defer(fn) { f.in_lambda_depth-- }`
`2059`	`2059`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2186,8 +2186,7 @@ fn (mut p Parser) dot_expr(left ast.Expr) ast.Expr {`
`2186`	`2186`	`} else {`
`2187`	`2187`	`p.name_error = true`
`2188`	`2188`	`}`
`2189`		`- is_filter := field_name in ['filter', 'map', 'any', 'all', 'count']`
`2190`		`- if is_filter \|\| field_name == 'sort' \|\| field_name == 'sorted' {`
	`2189`	`+ if ast.builtin_array_generic_methods_matcher.matches(field_name) {`
`2191`	`2190`	`if p.file_backend_mode == .v \|\| p.file_backend_mode == .c {`
`2192`	`2191`	`p.register_auto_import('builtin.closure')`
`2193`	`2192`	`}`