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: small cleanup in Checker.check_ref_fields_initialized

Browse Source
This commit is contained in:
Delyan Angelov
2022-10-02 12:09:07 +03:00
parent eec126e26c
commit 35368b5721
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
vlib/v/checker/struct.v
View File

@ -488,7 +488,7 @@ pub fn (mut c Checker) struct_init(mut node ast.StructInit) ast.Type {
// If the return value data composition form in `c.table.struct_fields()` is modified, // If the return value data composition form in `c.table.struct_fields()` is modified,
// need to modify here accordingly. // need to modify here accordingly.
fields := c.table.struct_fields(type_sym) fields := c.table.struct_fields(type_sym)
mut checked_structs := []ast.Type{} mut checked_types := []ast.Type{}
for i, field in fields { for i, field in fields {
if field.name in inited_fields { if field.name in inited_fields {
continue continue
@ -519,13 +519,13 @@ pub fn (mut c Checker) struct_init(mut node ast.StructInit) ast.Type {
node.pos) node.pos)
continue continue
} }
if sym.kind == .struct_ && !(sym.info as ast.Struct).is_typedef { if sym.kind == .struct_ {
c.check_ref_fields_initialized(sym, mut checked_structs, '${type_sym.name}.$field.name', c.check_ref_fields_initialized(sym, mut checked_types, '${type_sym.name}.$field.name',
node) node)
} else if sym.kind == .alias { } else if sym.kind == .alias {
parent_sym := c.table.sym((sym.info as ast.Alias).parent_type) parent_sym := c.table.sym((sym.info as ast.Alias).parent_type)
if parent_sym.kind == .struct_ { if parent_sym.kind == .struct_ {
c.check_ref_fields_initialized(parent_sym, mut checked_structs, c.check_ref_fields_initialized(parent_sym, mut checked_types,
'${type_sym.name}.$field.name', node) '${type_sym.name}.$field.name', node)
} }
} }
@ -565,6 +565,7 @@ pub fn (mut c Checker) struct_init(mut node ast.StructInit) ast.Type {
} }
} }
} }
// println('>> checked_types.len: $checked_types.len | checked_types: $checked_types | type_sym: $type_sym.name ')
} }
else {} else {}
} }
@ -590,15 +591,20 @@ pub fn (mut c Checker) struct_init(mut node ast.StructInit) ast.Type {
} }
// Recursively check whether the struct type field is initialized // Recursively check whether the struct type field is initialized
fn (mut c Checker) check_ref_fields_initialized(struct_sym &ast.TypeSymbol, mut checked_structs []ast.Type, linked_name string, node &ast.StructInit) { fn (mut c Checker) check_ref_fields_initialized(struct_sym &ast.TypeSymbol, mut checked_types []ast.Type, linked_name string, node &ast.StructInit) {
if c.pref.translated || c.file.is_translated { if c.pref.translated || c.file.is_translated {
return return
} }
if struct_sym.kind == .struct_ && struct_sym.language == .c
&& (struct_sym.info as ast.Struct).is_typedef {
return
}
fields := c.table.struct_fields(struct_sym) fields := c.table.struct_fields(struct_sym)
for field in fields { for field in fields {
sym := c.table.sym(field.typ) sym := c.table.sym(field.typ)
if field.name.len > 0 && field.name[0].is_capital() && sym.info is ast.Struct if field.name.len > 0 && field.name[0].is_capital() && sym.info is ast.Struct
&& sym.language == .v { && sym.language == .v {
// an embedded struct field
continue continue
} }
if field.typ.is_ptr() && !field.typ.has_flag(.shared_f) && !field.has_default_expr { if field.typ.is_ptr() && !field.typ.has_flag(.shared_f) && !field.has_default_expr {
@ -607,18 +613,20 @@ fn (mut c Checker) check_ref_fields_initialized(struct_sym &ast.TypeSymbol, mut
continue continue
} }
if sym.kind == .struct_ { if sym.kind == .struct_ {
info := sym.info as ast.Struct if sym.language == .c && (sym.info as ast.Struct).is_typedef {
if info.is_typedef || field.typ in checked_structs {
continue continue
} }
checked_structs << field.typ if field.typ in checked_types {
c.check_ref_fields_initialized(sym, mut checked_structs, '${linked_name}.$field.name', continue
}
checked_types << field.typ
c.check_ref_fields_initialized(sym, mut checked_types, '${linked_name}.$field.name',
node) node)
} else if sym.kind == .alias { } else if sym.kind == .alias {
parent_sym := c.table.sym((sym.info as ast.Alias).parent_type) psym := c.table.sym((sym.info as ast.Alias).parent_type)
if parent_sym.kind == .struct_ { if psym.kind == .struct_ {
checked_structs << field.typ checked_types << field.typ
c.check_ref_fields_initialized(parent_sym, mut checked_structs, '${linked_name}.$field.name', c.check_ref_fields_initialized(psym, mut checked_types, '${linked_name}.$field.name',
node) node)
} }
} }