vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

checker: cleanup generic structs (#10086)

pull/10088/head
yuyi 2021-05-13 00:57:14 +08:00 committed by GitHub
parent cf3dd7a51f
commit ebe58dcafa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1180,13 +1180,17 @@ pub fn (mut t Table) resolve_generic_to_concrete(generic_type Type, generic_name
} else if mut sym.info is Struct { } else if mut sym.info is Struct {
if sym.info.is_generic && is_inst { if sym.info.is_generic && is_inst {
mut nrt := '$sym.name<' mut nrt := '$sym.name<'
for i in 0 .. concrete_types.len { for i in 0 .. sym.info.generic_types.len {
gts := t.get_type_symbol(concrete_types[i]) if ct := t.resolve_generic_to_concrete(sym.info.generic_types[i], generic_names,
concrete_types, false)
{
gts := t.get_type_symbol(ct)
nrt += gts.name nrt += gts.name
if i != concrete_types.len - 1 { if i != sym.info.generic_types.len - 1 {
nrt += ',' nrt += ','
} }
} }
}
nrt += '>' nrt += '>'
mut idx := t.type_idxs[nrt] mut idx := t.type_idxs[nrt]
if idx == 0 { if idx == 0 {

21
vlib/v/checker/checker.v
View File

@ -1613,21 +1613,25 @@ fn (mut c Checker) check_map_and_filter(is_map bool, elem_typ ast.Type, call_exp
} }
} }
fn (mut c Checker) check_return_generics_struct(return_type ast.Type, mut call_expr ast.CallExpr, concrete_types []ast.Type) { fn (mut c Checker) check_return_generics_struct(return_type ast.Type, mut call_expr ast.CallExpr, generic_names []string, concrete_types []ast.Type) {
rts := c.table.get_type_symbol(return_type) rts := c.table.get_type_symbol(return_type)
if rts.info is ast.Struct { if rts.info is ast.Struct {
if rts.info.is_generic { if rts.info.is_generic {
mut nrt := '$rts.name<' mut nrt := '$rts.name<'
mut c_nrt := '${rts.name}_T_' mut c_nrt := '${rts.name}_T_'
for i in 0 .. call_expr.concrete_types.len { for i in 0 .. rts.info.generic_types.len {
gts := c.table.get_type_symbol(call_expr.concrete_types[i]) if ct := c.table.resolve_generic_to_concrete(rts.info.generic_types[i],
generic_names, concrete_types, false)
{
gts := c.table.get_type_symbol(ct)
nrt += gts.name nrt += gts.name
c_nrt += gts.name c_nrt += gts.name
if i != call_expr.concrete_types.len - 1 { if i != rts.info.generic_types.len - 1 {
nrt += ',' nrt += ','
c_nrt += '_' c_nrt += '_'
} }
} }
}
nrt += '>' nrt += '>'
idx := c.table.type_idxs[nrt] idx := c.table.type_idxs[nrt]
if idx != 0 { if idx != 0 {
@ -1635,8 +1639,7 @@ fn (mut c Checker) check_return_generics_struct(return_type ast.Type, mut call_e
call_expr.return_type = ast.new_type(idx).derive(return_type).clear_flag(.generic) call_expr.return_type = ast.new_type(idx).derive(return_type).clear_flag(.generic)
} else { } else {
mut fields := rts.info.fields.clone() mut fields := rts.info.fields.clone()
if rts.info.generic_types.len == concrete_types.len { if generic_names.len == concrete_types.len {
generic_names := rts.info.generic_types.map(c.table.get_type_symbol(it).name)
for i in 0 .. fields.len { for i in 0 .. fields.len {
if t_typ := c.table.resolve_generic_to_concrete(fields[i].typ, if t_typ := c.table.resolve_generic_to_concrete(fields[i].typ,
generic_names, concrete_types, true) generic_names, concrete_types, true)
@ -1941,7 +1944,8 @@ pub fn (mut c Checker) method_call(mut call_expr ast.CallExpr) ast.Type {
} }
// resolve return generics struct to concrete type // resolve return generics struct to concrete type
if method.generic_names.len > 0 && method.return_type.has_flag(.generic) { if method.generic_names.len > 0 && method.return_type.has_flag(.generic) {
c.check_return_generics_struct(method.return_type, mut call_expr, concrete_types) c.check_return_generics_struct(method.return_type, mut call_expr, method.generic_names,
concrete_types)
} else { } else {
call_expr.return_type = method.return_type call_expr.return_type = method.return_type
} }
@ -2500,7 +2504,8 @@ pub fn (mut c Checker) fn_call(mut call_expr ast.CallExpr) ast.Type {
} }
// resolve return generics struct to concrete type // resolve return generics struct to concrete type
if func.generic_names.len > 0 && func.return_type.has_flag(.generic) { if func.generic_names.len > 0 && func.return_type.has_flag(.generic) {
c.check_return_generics_struct(func.return_type, mut call_expr, concrete_types) c.check_return_generics_struct(func.return_type, mut call_expr, func.generic_names,
concrete_types)
} else { } else {
call_expr.return_type = func.return_type call_expr.return_type = func.return_type
} }