TheCloud/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-16 10:57:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

cgen: cleanup index.v (#20252)

Browse Source
This commit is contained in:
yuyi 2023-12-22 16:13:33 +08:00 committed by GitHub
parent 5043e14e35
commit 380a33af12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,11 +48,10 @@ fn (mut g Gen) index_expr(node ast.IndexExpr) {
g.write(')')
}
}
} else {
if sym.kind == .aggregate
&& (sym.info as ast.Aggregate).types.filter(g.table.type_kind(it) !in [.array, .array_fixed, .string, .map]).len == 0 {
} else if sym.info is ast.Aggregate
&& sym.info.types.filter(g.table.type_kind(it) !in [.array, .array_fixed, .string, .map]).len == 0 {
// treating sumtype of array types
unwrapped_got_type := (sym.info as ast.Aggregate).types[g.aggregate_type_idx]
unwrapped_got_type := sym.info.types[g.aggregate_type_idx]
g.index_expr(ast.IndexExpr{ ...node, left_type: unwrapped_got_type })
} else {
g.expr(node.left)
@ -62,7 +61,6 @@ fn (mut g Gen) index_expr(node ast.IndexExpr) {
}
}
}
}
fn (mut g Gen) index_range_expr(node ast.IndexExpr, range ast.RangeExpr) {
sym := g.table.final_sym(g.unwrap_generic(node.left_type))
@ -97,18 +95,17 @@ fn (mut g Gen) index_range_expr(node ast.IndexExpr, range ast.RangeExpr) {
g.write('*')
}
g.expr(node.left)
} else if sym.kind == .array_fixed {
} else if sym.info is ast.ArrayFixed {
// Convert a fixed array to V array when doing `fixed_arr[start..end]`
info := sym.info as ast.ArrayFixed
noscan := g.check_noscan(info.elem_type)
noscan := g.check_noscan(sym.info.elem_type)
if node.is_gated {
g.write('array_slice_ni(')
} else {
g.write('array_slice(')
}
g.write('new_array_from_c_array${noscan}(')
ctype := g.typ(info.elem_type)
g.write('${info.size}, ${info.size}, sizeof(${ctype}), ')
ctype := g.typ(sym.info.elem_type)
g.write('${sym.info.size}, ${sym.info.size}, sizeof(${ctype}), ')
if node.left_type.is_ptr() {
g.write('*')
}
@ -138,9 +135,8 @@ fn (mut g Gen) index_range_expr(node ast.IndexExpr, range ast.RangeExpr) {
g.write(', ')
if range.has_high {
g.expr(range.high)
} else if sym.kind == .array_fixed {
info := sym.info as ast.ArrayFixed
g.write('${info.size}')
} else if sym.info is ast.ArrayFixed {
g.write('${sym.info.size}')
} else {
g.write('2147483647') // max_int
}