mirrors/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-13 22:42:26 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

checker: fix some specific interface generic inference within generics struct and method (#20932)

Browse source
This commit is contained in:
GGRei 2024-03-01 14:15:47 +01:00 • committed by GitHub
parent cc443e50bb
commit a87ba9e3ca
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 33 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
vlib/v/checker/interface.v
View file

@ -303,10 +303,16 @@ fn (mut c Checker) resolve_generic_interface(typ ast.Type, interface_type ast.Ty
} }
for i, iparam in imethod.params { for i, iparam in imethod.params {
param := method.params[i] or { ast.Param{} } param := method.params[i] or { ast.Param{} }
if iparam.typ.has_flag(.generic) { mut need_inferred_type := false
if !iparam.typ.has_flag(.generic) && iparam.typ == param.typ
&& imethod.return_type == method.return_type
&& imethod.name == method.name {
need_inferred_type = true
}
if iparam.typ.has_flag(.generic) || need_inferred_type {
param_sym := c.table.sym(iparam.typ) param_sym := c.table.sym(iparam.typ)
arg_sym := c.table.sym(param.typ) arg_sym := c.table.sym(param.typ)
if c.table.get_type_name(iparam.typ) == gt_name { if c.table.get_type_name(iparam.typ) == gt_name || need_inferred_type {
inferred_type = param.typ inferred_type = param.typ
} else if arg_sym.info is ast.Array && param_sym.info is ast.Array { } else if arg_sym.info is ast.Array && param_sym.info is ast.Array {
mut arg_elem_typ, mut param_elem_typ := arg_sym.info.elem_type, param_sym.info.elem_type mut arg_elem_typ, mut param_elem_typ := arg_sym.info.elem_type, param_sym.info.elem_type

25
vlib/v/tests/generics_interface_with_generic_method_using_generic_struct_test.v Normal file
View file

@ -0,0 +1,25 @@
struct Store[Z] {
mut:
event_handlers []IEventHandler[Z]
}
fn (mut me Store[Z]) add_event_handler(event_handler IEventHandler[Z]) {
me.event_handlers << IEventHandler[Z](event_handler)
}
interface IEventHandler[Z] {
mut:
apply(event Z)
}
struct UserEvent {}
struct UserEventHandler {}
pub fn (mut me UserEventHandler) apply(event UserEvent) {}
fn test_generic_interface_with_method_using_generic_struct() {
mut s := Store[UserEvent]{}
s.add_event_handler(UserEventHandler{})
assert s.event_handlers.len > 0
}