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: fix array sort error (#11046)

Browse Source
This commit is contained in:
yuyi 2021-08-04 11:31:57 +08:00 committed by GitHub
parent 2eb11110d6
commit b870f7a6f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vlib/builtin/array_test.v
View File

@ -897,6 +897,24 @@ fn test_i64_sort() {
assert f[6] == 79
}
fn test_a_b_paras_sort() {
mut arr_i := [1, 3, 2]
arr_i.sort(a < b)
println(arr_i)
assert arr_i == [1, 2, 3]
arr_i.sort(b < a)
println(arr_i)
assert arr_i == [3, 2, 1]
mut arr_f := [1.1, 3.3, 2.2]
arr_f.sort(a < b)
println(arr_f)
assert arr_f == [1.1, 2.2, 3.3]
arr_f.sort(b < a)
println(arr_f)
assert arr_f == [3.3, 2.2, 1.1]
}
/*
fn test_for_last() {
numbers := [1, 2, 3, 4]

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

@ -286,10 +286,16 @@ fn (mut g Gen) gen_array_sort(node ast.CallExpr) {
g.definitions.writeln('\tif (${styp}__lt(*b, *a)) { return -1; } else { return 1; }}')
} else {
field_type := g.typ(infix_expr.left_type)
left_name := '$infix_expr.left'
left_expr_str := g.expr_string(infix_expr.left)
right_expr_str := g.expr_string(infix_expr.right)
g.definitions.writeln('\t$field_type a_ = $left_expr_str;')
g.definitions.writeln('\t$field_type b_ = $right_expr_str;')
if left_name.starts_with('a') {
g.definitions.writeln('\t$field_type a_ = $left_expr_str;')
g.definitions.writeln('\t$field_type b_ = $right_expr_str;')
} else {
g.definitions.writeln('\t$field_type a_ = $right_expr_str;')
g.definitions.writeln('\t$field_type b_ = $left_expr_str;')
}
mut op1, mut op2 := '', ''
if infix_expr.left_type == ast.string_type {
if is_reverse {