type_resolver: fix map generic resolver (fix #24090) (#24092)

felipensp · web-flow · commit 51e78616182d · 2025-03-31T01:31:55.000+03:00
diff --git a/vlib/v/tests/comptime/comptime_infer_generic_map_test.v b/vlib/v/tests/comptime/comptime_infer_generic_map_test.v
@@ -0,0 +1,23 @@
+module main
+
+fn encode_map[K, V](m map[K]V) string {
+	return typeof(m).name
+}
+
+fn encode_array[T](arr []T) string {
+	for element in arr {
+		$if T is $map {
+			return encode_map(element)
+		}
+	}
+	return ''
+}
+
+fn test_main() {
+	x := [{
+		'123': '456'
+	}, {
+		'abc': 'def'
+	}]
+	assert encode_array(x) == 'map[string]string'
+}
diff --git a/vlib/v/type_resolver/generic_resolver.v b/vlib/v/type_resolver/generic_resolver.v
@@ -173,6 +173,19 @@ pub fn (mut t TypeResolver) resolve_args(cur_fn &ast.FnDecl, func &ast.Fn, mut n
 									ctyp = t.resolver.unwrap_generic(arg_sym.info.value_type)
 								}
 							}
+						} else if arg_sym.kind == .any {
+							cparam_type_sym := t.table.sym(t.resolver.unwrap_generic(ctyp))
+							if param_sym.info is ast.Map && cparam_type_sym.info is ast.Map {
+								if param_sym.info.key_type.has_flag(.generic) {
+									comptime_args[k] = cparam_type_sym.info.key_type
+									if param_sym.info.value_type.has_flag(.generic) {
+										k++
+										ctyp = cparam_type_sym.info.value_type
+									}
+								} else if param_sym.info.value_type.has_flag(.generic) {
+									ctyp = cparam_type_sym.info.value_type
+								}
+							}
 						}
 						comptime_args[k] = ctyp
 					}

Original file line number	Diff line number	Diff line change
`@@ -173,6 +173,19 @@ pub fn (mut t TypeResolver) resolve_args(cur_fn &ast.FnDecl, func &ast.Fn, mut n`
`173`	`173`	`ctyp = t.resolver.unwrap_generic(arg_sym.info.value_type)`
`174`	`174`	`}`
`175`	`175`	`}`
	`176`	`+ } else if arg_sym.kind == .any {`
	`177`	`+ cparam_type_sym := t.table.sym(t.resolver.unwrap_generic(ctyp))`
	`178`	`+ if param_sym.info is ast.Map && cparam_type_sym.info is ast.Map {`
	`179`	`+ if param_sym.info.key_type.has_flag(.generic) {`
	`180`	`+ comptime_args[k] = cparam_type_sym.info.key_type`
	`181`	`+ if param_sym.info.value_type.has_flag(.generic) {`
	`182`	`+ k++`
	`183`	`+ ctyp = cparam_type_sym.info.value_type`
	`184`	`+ }`
	`185`	`+ } else if param_sym.info.value_type.has_flag(.generic) {`
	`186`	`+ ctyp = cparam_type_sym.info.value_type`
	`187`	`+ }`
	`188`	`+ }`
`176`	`189`	`}`
`177`	`190`	`comptime_args[k] = ctyp`
`178`	`191`	`}`