TheCloud/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-12 08:57:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

checker: fix alias to struct generic type (fix #22866) (#22872)

Browse Source
This commit is contained in:
Felipe Pena 2024-11-17 08:35:04 -03:00 committed by GitHub
parent af875ede92
commit f1333be65e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 60 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
vlib/v/ast/table.v
View File

@ -1910,7 +1910,6 @@ pub fn (mut t Table) unwrap_generic_type(typ Type, generic_names []string, concr
pub fn (mut t Table) unwrap_generic_type_ex(typ Type, generic_names []string, concrete_types []Type, recheck_concrete_types bool) Type { pub fn (mut t Table) unwrap_generic_type_ex(typ Type, generic_names []string, concrete_types []Type, recheck_concrete_types bool) Type {
mut final_concrete_types := []Type{} mut final_concrete_types := []Type{}
mut fields := []StructField{} mut fields := []StructField{}
mut needs_unwrap_types := []Type{}
mut nrt := '' mut nrt := ''
mut c_nrt := '' mut c_nrt := ''
ts := t.sym(typ) ts := t.sym(typ)
@ -2008,6 +2007,17 @@ pub fn (mut t Table) unwrap_generic_type_ex(typ Type, generic_names []string, co
recheck_concrete_types) recheck_concrete_types)
} }
} }
// update concrete types
for i in 0 .. ts.info.generic_types.len {
if t_typ := t.convert_generic_type(ts.info.generic_types[i], t_generic_names,
t_concrete_types)
{
final_concrete_types << t_typ
}
}
if final_concrete_types.len > 0 {
t.unwrap_method_types(ts, generic_names, concrete_types, final_concrete_types)
}
} }
return new_type(idx).derive(typ).clear_flag(.generic) return new_type(idx).derive(typ).clear_flag(.generic)
} else { } else {
@ -2056,27 +2066,6 @@ pub fn (mut t Table) unwrap_generic_type_ex(typ Type, generic_names []string, co
final_concrete_types << t_typ final_concrete_types << t_typ
} }
} }
if final_concrete_types.len > 0 {
for method in ts.methods {
for i in 1 .. method.params.len {
if method.params[i].typ.has_flag(.generic)
&& method.params[i].typ != method.params[0].typ {
if method.params[i].typ !in needs_unwrap_types {
needs_unwrap_types << method.params[i].typ
}
}
if method.return_type.has_flag(.generic)
&& method.return_type != method.params[0].typ {
if method.return_type !in needs_unwrap_types {
needs_unwrap_types << method.return_type
}
}
}
if final_concrete_types.len == method.generic_names.len {
t.register_fn_concrete_types(method.fkey(), final_concrete_types)
}
}
}
} }
} }
else {} else {}
@ -2096,8 +2085,8 @@ pub fn (mut t Table) unwrap_generic_type_ex(typ Type, generic_names []string, co
info: info info: info
is_pub: ts.is_pub is_pub: ts.is_pub
) )
for typ_ in needs_unwrap_types { if final_concrete_types.len > 0 {
t.unwrap_generic_type(typ_, generic_names, concrete_types) t.unwrap_method_types(ts, generic_names, concrete_types, final_concrete_types)
} }
return new_type(new_idx).derive(typ).clear_flag(.generic) return new_type(new_idx).derive(typ).clear_flag(.generic)
} }
@ -2132,8 +2121,8 @@ pub fn (mut t Table) unwrap_generic_type_ex(typ Type, generic_names []string, co
info: info info: info
is_pub: ts.is_pub is_pub: ts.is_pub
) )
for typ_ in needs_unwrap_types { if final_concrete_types.len > 0 {
t.unwrap_generic_type(typ_, generic_names, concrete_types) t.unwrap_method_types(ts, generic_names, concrete_types, final_concrete_types)
} }
return new_type(new_idx).derive(typ).clear_flag(.generic) return new_type(new_idx).derive(typ).clear_flag(.generic)
} }
@ -2187,6 +2176,31 @@ pub fn (mut t Table) unwrap_generic_type_ex(typ Type, generic_names []string, co
return typ return typ
} }
fn (mut t Table) unwrap_method_types(ts &TypeSymbol, generic_names []string, concrete_types []Type, final_concrete_types []Type) {
mut needs_unwrap_types := []Type{}
for method in ts.get_methods() {
for i in 1 .. method.params.len {
if method.params[i].typ.has_flag(.generic)
&& method.params[i].typ != method.params[0].typ {
if method.params[i].typ !in needs_unwrap_types {
needs_unwrap_types << method.params[i].typ
}
}
if method.return_type.has_flag(.generic) && method.return_type != method.params[0].typ {
if method.return_type !in needs_unwrap_types {
needs_unwrap_types << method.return_type
}
}
}
if final_concrete_types.len == method.generic_names.len {
t.register_fn_concrete_types(method.fkey(), final_concrete_types)
}
}
for typ_ in needs_unwrap_types {
t.unwrap_generic_type(typ_, generic_names, concrete_types)
}
}
// generic struct instantiations to concrete types // generic struct instantiations to concrete types
pub fn (mut t Table) generic_insts_to_concrete() { pub fn (mut t Table) generic_insts_to_concrete() {
for mut sym in t.type_symbols { for mut sym in t.type_symbols {

20
vlib/v/tests/aliases/alias_generic_struct_test.v Normal file
View File

@ -0,0 +1,20 @@
module main
import math.vec
type Vec4 = vec.Vec4[f32]
type Vec4x = vec.Vec4[f32]
fn test_main() {
mut v := Vec4{0, 0, 0, 1}
v.one()
assert v.x == 1
assert v.y == 1
assert v.z == 1
assert v.w == 1
v.from(Vec4x{3, 3, 3, 3})
assert v.x == 3
assert v.y == 3
assert v.z == 3
assert v.w == 3
}