mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

checker: fix infering fn type using reference argument (#15978)

Browse Source
This commit is contained in:
yuyi 2022-10-06 22:25:02 +08:00 committed by GitHub
parent 88d69d7d54
commit 73e28ec523
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vlib/v/checker/check_types.v
View File

@ -714,6 +714,9 @@ pub fn (mut c Checker) infer_fn_generic_types(func ast.Fn, mut node ast.CallExpr
} else { } else {
if param_elem_sym.name == gt_name { if param_elem_sym.name == gt_name {
typ = arg_elem_info.elem_type typ = arg_elem_info.elem_type
if param_elem_info.elem_type.nr_muls() > 0 && typ.nr_muls() > 0 {
typ = typ.set_nr_muls(0)
}
} }
break break
} }
@ -734,6 +737,9 @@ pub fn (mut c Checker) infer_fn_generic_types(func ast.Fn, mut node ast.CallExpr
} else { } else {
if param_elem_sym.name == gt_name { if param_elem_sym.name == gt_name {
typ = arg_elem_info.elem_type typ = arg_elem_info.elem_type
if param_elem_info.elem_type.nr_muls() > 0 && typ.nr_muls() > 0 {
typ = typ.set_nr_muls(0)
}
} }
break break
} }
@ -744,10 +750,16 @@ pub fn (mut c Checker) infer_fn_generic_types(func ast.Fn, mut node ast.CallExpr
if param_map_info.key_type.has_flag(.generic) if param_map_info.key_type.has_flag(.generic)
&& c.table.sym(param_map_info.key_type).name == gt_name { && c.table.sym(param_map_info.key_type).name == gt_name {
typ = arg_map_info.key_type typ = arg_map_info.key_type
if param_map_info.key_type.nr_muls() > 0 && typ.nr_muls() > 0 {
typ = typ.set_nr_muls(0)
}
} }
if param_map_info.value_type.has_flag(.generic) if param_map_info.value_type.has_flag(.generic)
&& c.table.sym(param_map_info.value_type).name == gt_name { && c.table.sym(param_map_info.value_type).name == gt_name {
typ = arg_map_info.value_type typ = arg_map_info.value_type
if param_map_info.value_type.nr_muls() > 0 && typ.nr_muls() > 0 {
typ = typ.set_nr_muls(0)
}
} }
} else if arg_sym.kind == .function && param_type_sym.kind == .function { } else if arg_sym.kind == .function && param_type_sym.kind == .function {
arg_type_func := (arg_sym.info as ast.FnType).func arg_type_func := (arg_sym.info as ast.FnType).func
@ -757,11 +769,17 @@ pub fn (mut c Checker) infer_fn_generic_types(func ast.Fn, mut node ast.CallExpr
if fn_param.typ.has_flag(.generic) if fn_param.typ.has_flag(.generic)
&& c.table.sym(fn_param.typ).name == gt_name { && c.table.sym(fn_param.typ).name == gt_name {
typ = arg_type_func.params[n].typ typ = arg_type_func.params[n].typ
if fn_param.typ.nr_muls() > 0 && typ.nr_muls() > 0 {
typ = typ.set_nr_muls(0)
}
} }
} }
if param_type_func.return_type.has_flag(.generic) if param_type_func.return_type.has_flag(.generic)
&& c.table.sym(param_type_func.return_type).name == gt_name { && c.table.sym(param_type_func.return_type).name == gt_name {
typ = arg_type_func.return_type typ = arg_type_func.return_type
if param_type_func.return_type.nr_muls() > 0 && typ.nr_muls() > 0 {
typ = typ.set_nr_muls(0)
}
} }
} }
} else if arg_sym.kind in [.struct_, .interface_, .sum_type] { } else if arg_sym.kind in [.struct_, .interface_, .sum_type] {

12
vlib/v/tests/generic_fn_infer_fn_type_using_ref_arg_test.v Normal file
View File

@ -0,0 +1,12 @@
fn test_generic_fn_infer_fn_type_using_ref_arg() {
ret := call_generic_fn(fn (a &int) bool {
return *a > 0
}, 1)
assert ret
}
fn call_generic_fn<T>(cb fn (&T) bool, input T) bool {
dump(cb(&input))
ret := cb(&input)
return ret
}