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

compiler: fix a bug with mutable array args

Browse Source
This commit is contained in:
Alexander Medvednikov 2019-08-07 12:09:24 +02:00
parent 0bcc53c366
commit 818c4a14e5
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compiler/fn.v
View File

@ -853,7 +853,7 @@ fn (p mut Parser) fn_call_args(f mut Fn) *Fn {
p.error(err) p.error(err)
} }
is_interface := p.table.is_interface(arg.typ) is_interface := p.table.is_interface(arg.typ)
// Add & or * before arg? // Add `&` or `*` before an argument?
if !is_interface { if !is_interface {
// Dereference // Dereference
if got.contains('*') && !expected.contains('*') { if got.contains('*') && !expected.contains('*') {
@ -862,11 +862,17 @@ fn (p mut Parser) fn_call_args(f mut Fn) *Fn {
// Reference // Reference
// TODO ptr hacks. DOOM hacks, fix please. // TODO ptr hacks. DOOM hacks, fix please.
if !got.contains('*') && expected.contains('*') && got != 'voidptr' { if !got.contains('*') && expected.contains('*') && got != 'voidptr' {
// Special case for mutable arrays. We can't & function results,
// have to use `(array[]){ expr }` hack.
if expected.starts_with('array_') && expected.ends_with('*') {
p.cgen.set_placeholder(ph, '& /*111*/ (array_int[]){')
p.gen('} ')
}
// println('\ne:"$expected" got:"$got"') // println('\ne:"$expected" got:"$got"')
if ! (expected == 'void*' && got == 'int') && else if ! (expected == 'void*' && got == 'int') &&
! (expected == 'byte*' && got.contains(']byte')) && ! (expected == 'byte*' && got.contains(']byte')) &&
! (expected == 'byte*' && got == 'string') { ! (expected == 'byte*' && got == 'string') {
p.cgen.set_placeholder(ph, '& /*11 EXP:"$expected" GOT:"$got" */') p.cgen.set_placeholder(ph, '& /*112 EXP:"$expected" GOT:"$got" */')
} }
} }
} }

12
vlib/builtin/array_test.v
View File

@ -177,3 +177,15 @@ fn test_fixed() {
nums2 := [N]int nums2 := [N]int
assert nums2[N - 1] == 0 assert nums2[N - 1] == 0
} }
fn modify (numbers mut []int) {
numbers[0] = 777
}
fn test_mut_slice() {
mut n := [1,2,3]
modify(mut n.left(2))
assert n[0] == 777
println(n)
}