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

table: minor simplification and cleanup of resolve_generic (#9772)

pull/9777/head
yuyi 2021-04-17 07:38:07 +08:00 committed by GitHub
parent 515d8c0bc8
commit cb70ffef59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -948,16 +948,12 @@ pub fn (mut t Table) bitsize_to_type(bit_size int) Type {
// resolve_generic_by_names resolves generics to real types T => int. // resolve_generic_by_names resolves generics to real types T => int.
// Even map[string]map[string]T can be resolved. // Even map[string]map[string]T can be resolved.
// This is used for resolving the generic return type of CallExpr white `unwrap_generic` is used to resolve generic usage in FnDecl. // This is used for resolving the generic return type of CallExpr white `unwrap_generic` is used to resolve generic usage in FnDecl.
pub fn (mut t Table) resolve_generic_by_names(generic_type Type, generic_names []string, generic_types []Type) ?Type { pub fn (mut t Table) resolve_generic_by_names(generic_type Type, generic_names []string, concrete_types []Type) ?Type {
mut sym := t.get_type_symbol(generic_type) mut sym := t.get_type_symbol(generic_type)
if sym.name in generic_names { if sym.name in generic_names {
index := generic_names.index(sym.name) index := generic_names.index(sym.name)
mut typ := generic_types[index] typ := concrete_types[index]
typ = typ.set_nr_muls(generic_type.nr_muls()) return typ.derive(generic_type).clear_flag(.generic)
if generic_type.has_flag(.optional) {
typ = typ.set_flag(.optional)
}
return typ
} else if sym.kind == .array { } else if sym.kind == .array {
info := sym.info as Array info := sym.info as Array
mut elem_type := info.elem_type mut elem_type := info.elem_type
@ -968,23 +964,21 @@ pub fn (mut t Table) resolve_generic_by_names(generic_type Type, generic_names [
elem_sym = t.get_type_symbol(elem_type) elem_sym = t.get_type_symbol(elem_type)
dims++ dims++
} }
if typ := t.resolve_generic_by_names(elem_type, generic_names, generic_types) { if typ := t.resolve_generic_by_names(elem_type, generic_names, concrete_types) {
idx := t.find_or_register_array_with_dims(typ, dims) idx := t.find_or_register_array_with_dims(typ, dims)
array_typ := new_type(idx).derive(generic_type).clear_flag(.generic) return new_type(idx).derive(generic_type).clear_flag(.generic)
return array_typ
} }
} else if sym.kind == .chan { } else if sym.kind == .chan {
info := sym.info as Chan info := sym.info as Chan
if typ := t.resolve_generic_by_names(info.elem_type, generic_names, generic_types) { if typ := t.resolve_generic_by_names(info.elem_type, generic_names, concrete_types) {
idx := t.find_or_register_chan(typ, typ.nr_muls() > 0) idx := t.find_or_register_chan(typ, typ.nr_muls() > 0)
chan_typ := new_type(idx).derive(generic_type).clear_flag(.generic) return new_type(idx).derive(generic_type).clear_flag(.generic)
return chan_typ
} }
} else if mut sym.info is MultiReturn { } else if mut sym.info is MultiReturn {
mut types := []Type{} mut types := []Type{}
mut type_changed := false mut type_changed := false
for ret_type in sym.info.types { for ret_type in sym.info.types {
if typ := t.resolve_generic_by_names(ret_type, generic_names, generic_types) { if typ := t.resolve_generic_by_names(ret_type, generic_names, concrete_types) {
types << typ types << typ
type_changed = true type_changed = true
} else { } else {
@ -993,18 +987,17 @@ pub fn (mut t Table) resolve_generic_by_names(generic_type Type, generic_names [
} }
if type_changed { if type_changed {
idx := t.find_or_register_multi_return(types) idx := t.find_or_register_multi_return(types)
typ := new_type(idx).derive(generic_type).clear_flag(.generic) return new_type(idx).derive(generic_type).clear_flag(.generic)
return typ
} }
} else if mut sym.info is Map { } else if mut sym.info is Map {
mut type_changed := false mut type_changed := false
mut unwrapped_key_type := sym.info.key_type mut unwrapped_key_type := sym.info.key_type
mut unwrapped_value_type := sym.info.value_type mut unwrapped_value_type := sym.info.value_type
if typ := t.resolve_generic_by_names(sym.info.key_type, generic_names, generic_types) { if typ := t.resolve_generic_by_names(sym.info.key_type, generic_names, concrete_types) {
unwrapped_key_type = typ unwrapped_key_type = typ
type_changed = true type_changed = true
} }
if typ := t.resolve_generic_by_names(sym.info.value_type, generic_names, generic_types) { if typ := t.resolve_generic_by_names(sym.info.value_type, generic_names, concrete_types) {
unwrapped_value_type = typ unwrapped_value_type = typ
type_changed = true type_changed = true
} }
@ -1019,16 +1012,12 @@ pub fn (mut t Table) resolve_generic_by_names(generic_type Type, generic_names [
// resolve_generic_by_types resolves generics to real types T => int. // resolve_generic_by_types resolves generics to real types T => int.
// Even map[string]map[string]T can be resolved. // Even map[string]map[string]T can be resolved.
// This is used for resolving the generic return type of CallExpr white `unwrap_generic` is used to resolve generic usage in FnDecl. // This is used for resolving the generic return type of CallExpr white `unwrap_generic` is used to resolve generic usage in FnDecl.
pub fn (mut t Table) resolve_generic_by_types(generic_type Type, from_types []Type, to_types []Type) ?Type { pub fn (mut t Table) resolve_generic_by_types(generic_type Type, generic_types []Type, concrete_types []Type) ?Type {
mut sym := t.get_type_symbol(generic_type) mut sym := t.get_type_symbol(generic_type)
if generic_type in from_types { if generic_type in generic_types {
index := from_types.index(generic_type) index := generic_types.index(generic_type)
mut typ := to_types[index] typ := concrete_types[index]
typ = typ.set_nr_muls(generic_type.nr_muls()) return typ.derive(generic_type).clear_flag(.generic)
if generic_type.has_flag(.optional) {
typ = typ.set_flag(.optional)
}
return typ
} else if sym.kind == .array { } else if sym.kind == .array {
info := sym.info as Array info := sym.info as Array
mut elem_type := info.elem_type mut elem_type := info.elem_type
@ -1039,13 +1028,13 @@ pub fn (mut t Table) resolve_generic_by_types(generic_type Type, from_types []Ty
elem_sym = t.get_type_symbol(elem_type) elem_sym = t.get_type_symbol(elem_type)
dims++ dims++
} }
if typ := t.resolve_generic_by_types(elem_type, from_types, to_types) { if typ := t.resolve_generic_by_types(elem_type, generic_types, concrete_types) {
idx := t.find_or_register_array_with_dims(typ, dims) idx := t.find_or_register_array_with_dims(typ, dims)
return new_type(idx).derive(generic_type).clear_flag(.generic) return new_type(idx).derive(generic_type).clear_flag(.generic)
} }
} else if sym.kind == .chan { } else if sym.kind == .chan {
info := sym.info as Chan info := sym.info as Chan
if typ := t.resolve_generic_by_types(info.elem_type, from_types, to_types) { if typ := t.resolve_generic_by_types(info.elem_type, generic_types, concrete_types) {
idx := t.find_or_register_chan(typ, typ.nr_muls() > 0) idx := t.find_or_register_chan(typ, typ.nr_muls() > 0)
return new_type(idx).derive(generic_type).clear_flag(.generic) return new_type(idx).derive(generic_type).clear_flag(.generic)
} }
@ -1053,7 +1042,7 @@ pub fn (mut t Table) resolve_generic_by_types(generic_type Type, from_types []Ty
mut types := []Type{} mut types := []Type{}
mut type_changed := false mut type_changed := false
for ret_type in sym.info.types { for ret_type in sym.info.types {
if typ := t.resolve_generic_by_types(ret_type, from_types, to_types) { if typ := t.resolve_generic_by_types(ret_type, generic_types, concrete_types) {
types << typ types << typ
type_changed = true type_changed = true
} else { } else {
@ -1068,11 +1057,11 @@ pub fn (mut t Table) resolve_generic_by_types(generic_type Type, from_types []Ty
mut type_changed := false mut type_changed := false
mut unwrapped_key_type := sym.info.key_type mut unwrapped_key_type := sym.info.key_type
mut unwrapped_value_type := sym.info.value_type mut unwrapped_value_type := sym.info.value_type
if typ := t.resolve_generic_by_types(sym.info.key_type, from_types, to_types) { if typ := t.resolve_generic_by_types(sym.info.key_type, generic_types, concrete_types) {
unwrapped_key_type = typ unwrapped_key_type = typ
type_changed = true type_changed = true
} }
if typ := t.resolve_generic_by_types(sym.info.value_type, from_types, to_types) { if typ := t.resolve_generic_by_types(sym.info.value_type, generic_types, concrete_types) {
unwrapped_value_type = typ unwrapped_value_type = typ
type_changed = true type_changed = true
} }