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

cgen: clean up in index_of_map() (#18145)

Browse Source
This commit is contained in:
yuyi 2023-05-10 02:12:29 +08:00 committed by GitHub
parent 89f3288fb0
commit 9aa5e3fe4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
vlib/v/gen/c/index.v
View File

@ -389,27 +389,27 @@ fn (mut g Gen) index_of_map(node ast.IndexExpr, sym ast.TypeSymbol) {
left_is_ptr := node.left_type.is_ptr() left_is_ptr := node.left_type.is_ptr()
info := sym.info as ast.Map info := sym.info as ast.Map
key_type_str := g.typ(info.key_type) key_type_str := g.typ(info.key_type)
elem_type := info.value_type val_type := info.value_type
elem_sym := g.table.sym(elem_type) val_sym := g.table.sym(val_type)
elem_type_str := if elem_sym.kind == .function { val_type_str := if val_sym.kind == .function {
'voidptr' 'voidptr'
} else { } else {
if g.inside_return { if g.inside_return {
g.typ(elem_type) g.typ(val_type)
} else { } else {
g.typ(elem_type.clear_flags(.option, .result)) g.typ(val_type.clear_flags(.option, .result))
} }
} }
get_and_set_types := elem_sym.kind in [.struct_, .map, .array] get_and_set_types := val_sym.kind in [.struct_, .map, .array]
if g.is_assign_lhs && !g.is_arraymap_set && !get_and_set_types { if g.is_assign_lhs && !g.is_arraymap_set && !get_and_set_types {
if g.assign_op == .assign || info.value_type == ast.string_type { if g.assign_op == .assign || info.value_type == ast.string_type {
g.is_arraymap_set = true g.is_arraymap_set = true
g.write('map_set(') g.write('map_set(')
} else { } else {
if node.is_setter { if node.is_setter {
g.write('(*((${elem_type_str}*)map_get_and_set((map*)') g.write('(*((${val_type_str}*)map_get_and_set((map*)')
} else { } else {
g.write('(*((${elem_type_str}*)map_get((map*)') g.write('(*((${val_type_str}*)map_get((map*)')
} }
} }
if !left_is_ptr || node.left_type.has_flag(.shared_f) { if !left_is_ptr || node.left_type.has_flag(.shared_f) {
@ -435,7 +435,7 @@ fn (mut g Gen) index_of_map(node ast.IndexExpr, sym ast.TypeSymbol) {
g.is_assign_lhs = old_is_assign_lhs g.is_assign_lhs = old_is_assign_lhs
g.write('}') g.write('}')
g.arraymap_set_pos = g.out.len g.arraymap_set_pos = g.out.len
g.write(', &(${elem_type_str}[]) { ') g.write(', &(${val_type_str}[]) { ')
if g.assign_op != .assign && info.value_type != ast.string_type { if g.assign_op != .assign && info.value_type != ast.string_type {
zero := g.type_default(info.value_type) zero := g.type_default(info.value_type)
g.write('${zero} })))') g.write('${zero} })))')
@ -445,9 +445,9 @@ fn (mut g Gen) index_of_map(node ast.IndexExpr, sym ast.TypeSymbol) {
|| (g.is_assign_lhs && !g.is_arraymap_set && get_and_set_types) { || (g.is_assign_lhs && !g.is_arraymap_set && get_and_set_types) {
zero := g.type_default(info.value_type) zero := g.type_default(info.value_type)
if node.is_setter { if node.is_setter {
g.write('(*(${elem_type_str}*)map_get_and_set((map*)') g.write('(*(${val_type_str}*)map_get_and_set((map*)')
} else { } else {
g.write('(*(${elem_type_str}*)map_get((map*)') g.write('(*(${val_type_str}*)map_get((map*)')
} }
if !left_is_ptr || node.left_type.has_flag(.shared_f) { if !left_is_ptr || node.left_type.has_flag(.shared_f) {
g.write('&') g.write('&')
@ -461,7 +461,7 @@ fn (mut g Gen) index_of_map(node ast.IndexExpr, sym ast.TypeSymbol) {
g.is_assign_lhs = false g.is_assign_lhs = false
g.expr(node.index) g.expr(node.index)
g.is_assign_lhs = old_is_assign_lhs g.is_assign_lhs = old_is_assign_lhs
g.write('}, &(${elem_type_str}[]){ ${zero} }))') g.write('}, &(${val_type_str}[]){ ${zero} }))')
} else { } else {
zero := g.type_default(info.value_type) zero := g.type_default(info.value_type)
is_gen_or_and_assign_rhs := gen_or && !g.discard_or_result is_gen_or_and_assign_rhs := gen_or && !g.discard_or_result
@ -476,18 +476,18 @@ fn (mut g Gen) index_of_map(node ast.IndexExpr, sym ast.TypeSymbol) {
tmp_opt_ptr := if gen_or { g.new_tmp_var() } else { '' } tmp_opt_ptr := if gen_or { g.new_tmp_var() } else { '' }
mut is_fn_last_index_call := false mut is_fn_last_index_call := false
if gen_or { if gen_or {
g.write('${elem_type_str}* ${tmp_opt_ptr} = (${elem_type_str}*)(map_get_check(') g.write('${val_type_str}* ${tmp_opt_ptr} = (${val_type_str}*)(map_get_check(')
} else { } else {
if g.is_fn_index_call { if g.is_fn_index_call {
if elem_sym.info is ast.FnType { if val_sym.info is ast.FnType {
g.write('((') g.write('((')
g.write_fn_ptr_decl(&elem_sym.info, '') g.write_fn_ptr_decl(&val_sym.info, '')
g.write(')(*(voidptr*)map_get(') g.write(')(*(voidptr*)map_get(')
is_fn_last_index_call = true is_fn_last_index_call = true
g.is_fn_index_call = false g.is_fn_index_call = false
} }
} else { } else {
g.write('(*(${elem_type_str}*)map_get(') g.write('(*(${val_type_str}*)map_get(')
} }
} }
if !left_is_ptr || node.left_type.has_flag(.shared_f) { if !left_is_ptr || node.left_type.has_flag(.shared_f) {
@ -512,21 +512,21 @@ fn (mut g Gen) index_of_map(node ast.IndexExpr, sym ast.TypeSymbol) {
} else if is_fn_last_index_call { } else if is_fn_last_index_call {
g.write(', &(voidptr[]){ ${zero} })))') g.write(', &(voidptr[]){ ${zero} })))')
} else { } else {
g.write(', &(${elem_type_str}[]){ ${zero} }))') g.write(', &(${val_type_str}[]){ ${zero} }))')
} }
if gen_or { if gen_or {
g.writeln(';') g.writeln(';')
opt_elem_type := g.typ(elem_type.set_flag(.option)) opt_val_type := g.typ(val_type.set_flag(.option))
g.writeln('${opt_elem_type} ${tmp_opt} = {0};') g.writeln('${opt_val_type} ${tmp_opt} = {0};')
g.writeln('if (${tmp_opt_ptr}) {') g.writeln('if (${tmp_opt_ptr}) {')
g.writeln('\t*((${elem_type_str}*)&${tmp_opt}.data) = *((${elem_type_str}*)${tmp_opt_ptr});') g.writeln('\t*((${val_type_str}*)&${tmp_opt}.data) = *((${val_type_str}*)${tmp_opt_ptr});')
g.writeln('} else {') g.writeln('} else {')
g.writeln('\t${tmp_opt}.state = 2; ${tmp_opt}.err = _v_error(_SLIT("array index out of range"));') g.writeln('\t${tmp_opt}.state = 2; ${tmp_opt}.err = _v_error(_SLIT("array index out of range"));')
g.writeln('}') g.writeln('}')
if !node.is_option { if !node.is_option {
g.or_block(tmp_opt, node.or_expr, elem_type) g.or_block(tmp_opt, node.or_expr, val_type)
} }
g.write('\n${cur_line}(*(${elem_type_str}*)${tmp_opt}.data)') g.write('\n${cur_line}(*(${val_type_str}*)${tmp_opt}.data)')
} }
} }
} }