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

table: minor cleanup in does_type_implement_interface() (#10870)

pull/10875/head
yuyi 2021-07-20 20:19:02 +08:00 committed by GitHub
parent f457b94fe4
commit 850a715c79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1109,16 +1109,15 @@ pub fn (mut t Table) bitsize_to_type(bit_size int) Type {
} }
pub fn (mut t Table) does_type_implement_interface(typ Type, inter_typ Type) bool { pub fn (mut t Table) does_type_implement_interface(typ Type, inter_typ Type) bool {
utyp := typ if typ.idx() == inter_typ.idx() {
if utyp.idx() == inter_typ.idx() {
// same type -> already casted to the interface // same type -> already casted to the interface
return true return true
} }
if inter_typ.idx() == error_type_idx && utyp.idx() == none_type_idx { if inter_typ.idx() == error_type_idx && typ.idx() == none_type_idx {
// `none` "implements" the Error interface // `none` "implements" the Error interface
return true return true
} }
typ_sym := t.get_type_symbol(utyp) typ_sym := t.get_type_symbol(typ)
if typ_sym.language != .v { if typ_sym.language != .v {
return false return false
} }
@ -1129,7 +1128,7 @@ pub fn (mut t Table) does_type_implement_interface(typ Type, inter_typ Type) boo
if mut inter_sym.info is Interface { if mut inter_sym.info is Interface {
// do not check the same type more than once // do not check the same type more than once
for tt in inter_sym.info.types { for tt in inter_sym.info.types {
if tt.idx() == utyp.idx() { if tt.idx() == typ.idx() {
return true return true
} }
} }
@ -1165,7 +1164,7 @@ pub fn (mut t Table) does_type_implement_interface(typ Type, inter_typ Type) boo
} }
return false return false
} }
inter_sym.info.types << utyp inter_sym.info.types << typ
if !inter_sym.info.types.contains(voidptr_type) { if !inter_sym.info.types.contains(voidptr_type) {
inter_sym.info.types << voidptr_type inter_sym.info.types << voidptr_type
} }