TheCloud/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-08-04 02:07:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

cgen: fix aliases of array insert(...)/prepend(...) (fix #22323) (#22324)

Browse Source
This commit is contained in:
yuyi 2024-09-27 12:41:13 +08:00 committed by GitHub
parent 765b88f9f2
commit c7bdc0a781
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vlib/builtin/array_test.v
View File

@ -191,6 +191,24 @@ fn test_prepend_many() {
assert a == [5, 6, 1, 2, 3, 4]
}
type Strings = []string
fn test_aliases_of_array_insert() {
mut strs := Strings(['hi'])
strs.insert(0, '22')
assert strs == ['22', 'hi']
strs.insert(1, ['11'])
assert strs == ['22', '11', 'hi']
}
fn test_aliases_of_array_prepend() {
mut strs := Strings(['hi'])
strs.prepend('22')
assert strs == ['22', 'hi']
strs.prepend(['44', '33'])
assert strs == ['44', '33', '22', 'hi']
}
fn test_strings() {
a := ['a', 'b', 'c']
assert a.str() == "['a', 'b', 'c']"

13
vlib/v/gen/c/array.v
View File

@ -874,12 +874,12 @@ fn (mut g Gen) gen_array_filter(node ast.CallExpr) {
// `nums.insert(0, 2)` `nums.insert(0, [2,3,4])`
fn (mut g Gen) gen_array_insert(node ast.CallExpr) {
left_sym := g.table.sym(node.left_type)
left_sym := g.table.final_sym(node.left_type)
left_info := left_sym.info as ast.Array
elem_type_str := g.typ(left_info.elem_type)
arg2_sym := g.table.sym(node.args[1].typ)
arg2_sym := g.table.final_sym(node.args[1].typ)
is_arg2_array := arg2_sym.kind == .array
&& node.args[1].typ.clear_flag(.variadic) == node.left_type
&& node.args[1].typ.clear_flag(.variadic) in [node.left_type, g.table.unaliased_type(node.left_type)]
noscan := g.check_noscan(left_info.elem_type)
addr := if node.left_type.is_ptr() { '' } else { '&' }
if is_arg2_array {
@ -911,11 +911,12 @@ fn (mut g Gen) gen_array_insert(node ast.CallExpr) {
// `nums.prepend(2)` `nums.prepend([2,3,4])`
fn (mut g Gen) gen_array_prepend(node ast.CallExpr) {
left_sym := g.table.sym(node.left_type)
left_sym := g.table.final_sym(node.left_type)
left_info := left_sym.info as ast.Array
elem_type_str := g.typ(left_info.elem_type)
arg_sym := g.table.sym(node.args[0].typ)
is_arg_array := arg_sym.kind == .array && node.args[0].typ == node.left_type
arg_sym := g.table.final_sym(node.args[0].typ)
is_arg_array := arg_sym.kind == .array
&& node.args[0].typ in [node.left_type, g.table.unaliased_type(node.left_type)]
noscan := g.check_noscan(left_info.elem_type)
addr := if node.left_type.is_ptr() { '' } else { '&' }
if is_arg_array {

2
vlib/v/gen/c/fn.v
View File

@ -1568,7 +1568,7 @@ fn (mut g Gen) method_call(node ast.CallExpr) {
left_sym := g.table.sym(left_type)
final_left_sym := g.table.final_sym(left_type)
if left_sym.kind == .array || (final_left_sym.kind == .array
&& node.name in ['filter', 'map', 'sort', 'sorted', 'contains', 'any', 'all']) {
&& node.name in ['filter', 'map', 'sort', 'sorted', 'contains', 'any', 'all', 'insert', 'prepend']) {
if g.gen_array_method_call(node, left_type) {
return
}