mirrors/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-13 14:32:26 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

markused: cleanup and minor optmizations (#25046)

Browse source
This commit is contained in:
Felipe Pena 2025-08-05 15:37:59 -03:00 • committed by GitHub
parent af89eb27c7
commit 1d7b5070bd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 37 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

10
vlib/v/checker/checker.v
View file

@ -5020,18 +5020,8 @@ fn (mut c Checker) index_expr(mut node ast.IndexExpr) ast.Type {
typ_sym = unsafe { unwrapped_sym } typ_sym = unsafe { unwrapped_sym }
} }
} }
// .string {
// if node.is_gated && c.mod != 'strings' {
// c.table.used_features.range_index = true
// }
// }
else {} else {}
} }
// if !c.is_builtin_mod && c.mod !in ['strings', 'math.bits'] {
// if node.index is ast.RangeExpr {
// c.table.used_features.range_index = true
// }
// }
is_aggregate_arr := typ_sym.kind == .aggregate is_aggregate_arr := typ_sym.kind == .aggregate
&& (typ_sym.info as ast.Aggregate).types.filter(c.table.type_kind(it) !in [.array, .array_fixed, .string, .map]).len == 0 && (typ_sym.info as ast.Aggregate).types.filter(c.table.type_kind(it) !in [.array, .array_fixed, .string, .map]).len == 0
if typ_sym.kind !in [.array, .array_fixed, .string, .map] if typ_sym.kind !in [.array, .array_fixed, .string, .map]

68
vlib/v/markused/walker.v
View file

@ -9,20 +9,24 @@ import v.pref
pub struct Walker { pub struct Walker {
pub mut: pub mut:
table &ast.Table = unsafe { nil } table &ast.Table = unsafe { nil }
features &ast.UsedFeatures = unsafe { nil } features &ast.UsedFeatures = unsafe { nil }
used_fns map[string]bool // used_fns['println'] == true used_fns map[string]bool // used_fns['println'] == true
trace_enabled bool trace_enabled bool
used_consts map[string]bool // used_consts['os.args'] == true used_consts map[string]bool // used_consts['os.args'] == true
used_globals map[string]bool used_globals map[string]bool
used_fields map[string]bool used_fields map[string]bool
used_syms map[int]bool used_structs map[string]bool
used_none int // _option_none used_types map[ast.Type]bool
used_option int // _option_ok used_syms map[int]bool
used_result int // _result_ok used_arr_method map[string]bool
used_panic int // option/result propagation used_map_method map[string]bool
used_closures int // fn [x] (){}, and `instance.method` used in an expression used_none int // _option_none
pref &pref.Preferences = unsafe { nil } used_option int // _option_ok
used_result int // _result_ok
used_panic int // option/result propagation
used_closures int // fn [x] (){}, and `instance.method` used in an expression
pref &pref.Preferences = unsafe { nil }
mut: mut:
all_fns map[string]ast.FnDecl all_fns map[string]ast.FnDecl
all_consts map[string]ast.ConstField all_consts map[string]ast.ConstField
@ -551,8 +555,8 @@ fn (mut w Walker) expr(node_ ast.Expr) {
} else if !node.is_setter && !w.uses_map_getter { } else if !node.is_setter && !w.uses_map_getter {
w.mark_builtin_map_method_as_used('get') w.mark_builtin_map_method_as_used('get')
} }
w.mark_by_sym(w.table.sym(sym.info.key_type)) w.mark_by_type(sym.info.key_type)
w.mark_by_sym(w.table.sym(sym.info.value_type)) w.mark_by_type(sym.info.value_type)
w.features.used_maps++ w.features.used_maps++
} else if sym.kind in [.array, .array_fixed, .any] { } else if sym.kind in [.array, .array_fixed, .any] {
if !w.is_direct_array_access || w.features.auto_str_arr { if !w.is_direct_array_access || w.features.auto_str_arr {
@ -565,9 +569,9 @@ fn (mut w Walker) expr(node_ ast.Expr) {
} }
} }
if sym.info is ast.Array { if sym.info is ast.Array {
w.mark_by_sym(w.table.sym(sym.info.elem_type)) w.mark_by_type(sym.info.elem_type)
} else if sym.info is ast.ArrayFixed { } else if sym.info is ast.ArrayFixed {
w.mark_by_sym(w.table.sym(sym.info.elem_type)) w.mark_by_type(sym.info.elem_type)
} }
if !w.uses_arr_range_index { if !w.uses_arr_range_index {
w.uses_arr_range_index = true w.uses_arr_range_index = true
@ -1000,8 +1004,18 @@ pub fn (mut w Walker) call_expr(mut node ast.CallExpr) {
// All []Type or map[Type]Another types are typedefs to those `map` and `array` types, and all map and array methods // All []Type or map[Type]Another types are typedefs to those `map` and `array` types, and all map and array methods
// are actually methods on the `builtin` concrete types. // are actually methods on the `builtin` concrete types.
match lsym.kind { match lsym.kind {
.array { w.mark_builtin_array_method_as_used(node.name) } .array {
.map { w.mark_builtin_map_method_as_used(node.name) } if !w.used_arr_method[node.name] {
w.mark_builtin_array_method_as_used(node.name)
w.used_arr_method[node.name] = true
}
}
.map {
if !w.used_map_method[node.name] {
w.mark_builtin_map_method_as_used(node.name)
w.used_map_method[node.name] = true
}
}
else {} else {}
} }
} }
@ -1040,7 +1054,6 @@ pub fn (mut w Walker) fn_by_name(fn_name string) {
} }
mut stmt := w.all_fns[fn_name] or { return } mut stmt := w.all_fns[fn_name] or { return }
w.fn_decl(mut stmt) w.fn_decl(mut stmt)
// w.stmts(stmt.stmts)
} }
pub fn (mut w Walker) struct_fields(sfields []ast.StructField) { pub fn (mut w Walker) struct_fields(sfields []ast.StructField) {
@ -1096,10 +1109,11 @@ pub fn (mut w Walker) mark_by_sym_name(name string) {
@[inline] @[inline]
pub fn (mut w Walker) mark_by_type(typ ast.Type) { pub fn (mut w Walker) mark_by_type(typ ast.Type) {
if typ == 0 || typ.has_flag(.generic) { if typ == 0 || typ.has_flag(.generic) || typ in w.used_types {
return return
} }
w.mark_by_sym(w.table.sym(typ)) w.mark_by_sym(w.table.sym(typ))
w.used_types[typ] = true
} }
pub fn (mut w Walker) mark_by_sym(isym ast.TypeSymbol) { pub fn (mut w Walker) mark_by_sym(isym ast.TypeSymbol) {
@ -1121,15 +1135,7 @@ pub fn (mut w Walker) mark_by_sym(isym ast.TypeSymbol) {
w.used_none++ w.used_none++
} }
} }
match fsym.info { w.mark_by_sym(fsym)
ast.Map {
w.features.used_maps++
w.mark_by_sym(fsym)
}
else {
w.mark_by_sym(fsym)
}
}
} }
if !w.features.auto_str_ptr && ifield.typ.is_ptr() if !w.features.auto_str_ptr && ifield.typ.is_ptr()
&& isym.idx in w.features.print_types { && isym.idx in w.features.print_types {