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 generic method with nested generic method (#15480)

Browse Source
This commit is contained in:
yuyi 2022-08-21 19:12:31 +08:00 committed by GitHub
parent 3656d445ab
commit f194d3ca2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
vlib/v/checker/fn.v
View File

@ -307,7 +307,8 @@ fn (mut c Checker) fn_decl(mut node ast.FnDecl) {
}
if node.return_type != ast.void_type_idx
&& node.return_type.clear_flag(.optional) != ast.void_type_idx {
&& node.return_type.clear_flag(.optional) != ast.void_type_idx
&& node.return_type.clear_flag(.result) != ast.void_type_idx {
c.error('test functions should either return nothing at all, or be marked to return `?`',
node.pos)
}
@ -1318,6 +1319,7 @@ pub fn (mut c Checker) method_call(mut node ast.CallExpr) ast.Type {
}
node.is_noreturn = method.is_noreturn
node.is_ctor_new = method.is_ctor_new
node.return_type = method.return_type
if !method.is_pub && !c.pref.is_test && method.mod != c.mod {
// If a private method is called outside of the module
// its receiver type is defined in, show an error.
@ -1550,21 +1552,16 @@ pub fn (mut c Checker) method_call(mut node ast.CallExpr) ast.Type {
c.table.register_fn_concrete_types(method.fkey(), concrete_types)
}
// resolve return generics struct to concrete type
if method.generic_names.len > 0 && method.return_type.has_flag(.generic)
&& !isnil(c.table.cur_fn) && c.table.cur_fn.generic_names.len == 0 {
node.return_type = c.table.unwrap_generic_type(method.return_type, method.generic_names,
concrete_types)
} else {
node.return_type = method.return_type
}
if node.concrete_types.len > 0 && method.return_type != 0 && !isnil(c.table.cur_fn)
&& c.table.cur_fn.generic_names.len == 0 {
if node.concrete_types.len > 0 && node.concrete_types.all(!it.has_flag(.generic))
&& method.return_type.has_flag(.generic) && method.generic_names.len > 0
&& method.generic_names.len == node.concrete_types.len {
if typ := c.table.resolve_generic_to_concrete(method.return_type, method.generic_names,
concrete_types)
{
node.return_type = typ
return typ
} else {
node.return_type = c.table.unwrap_generic_type(method.return_type, method.generic_names,
concrete_types)
}
}
if node.concrete_types.len > 0 && method.generic_names.len == 0 {
@ -1578,9 +1575,8 @@ pub fn (mut c Checker) method_call(mut node ast.CallExpr) ast.Type {
}
}
}
return node.return_type
}
return method.return_type
return node.return_type
}
// TODO: str methods
if method_name == 'str' {

23
vlib/v/tests/generics_method_with_nested_generic_method_test.v Normal file
View File

@ -0,0 +1,23 @@
struct Dummy {}
fn (dummy &Dummy) res<T>() !T {
$if T is int {
return 1
} $else $if T is f32 {
return dummy.res<int>()! + 1
} $else {
return error('exhausted')
}
}
fn test_generics_method_with_nested_generic_method() ! {
d := Dummy{}
println(d.res<int>()!)
ret1 := d.res<int>()!
assert ret1 == 1
println(d.res<f32>()!)
ret2 := d.res<f32>()!
assert ret2 == 2.0
}