vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

cgen: generate an unique sort comparator function for each .sort() call

pull/6946/head
Delyan Angelov 2020-11-25 13:41:05 +02:00
parent a46eda7c44
commit 35a0fe79f9
2 changed files with 59 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vlib/v/gen/cgen.v
View File

@ -4879,12 +4879,11 @@ fn (mut g Gen) gen_array_sort(node ast.CallExpr) {
verror('usage: .sort(a.field < b.field)') verror('usage: .sort(a.field < b.field)')
} }
// verror('sort(): unhandled type $typ $q.name') // verror('sort(): unhandled type $typ $q.name')
compare_fn = 'compare_' + g.typ(typ) tmp_name := g.new_tmp_var()
compare_fn = 'compare_${tmp_name}_' + g.typ(typ)
if is_reverse { if is_reverse {
compare_fn += '_reverse' compare_fn += '_reverse'
} }
if _ := g.table.find_fn(compare_fn) {
} else {
// Register a new custom `compare_xxx` function for qsort() // Register a new custom `compare_xxx` function for qsort()
g.table.register_fn({ g.table.register_fn({
name: compare_fn name: compare_fn
@ -4896,9 +4895,9 @@ fn (mut g Gen) gen_array_sort(node ast.CallExpr) {
// when generating the function as long as the args are named the same. // when generating the function as long as the args are named the same.
g.definitions.writeln('int $compare_fn ($styp* a, $styp* b) {') g.definitions.writeln('int $compare_fn ($styp* a, $styp* b) {')
field_type := g.typ(infix_expr.left_type) field_type := g.typ(infix_expr.left_type)
left_expr_str := g.write_expr_to_string(infix_expr.left).replace('.', left_expr_str := g.write_expr_to_string(infix_expr.left).replace_once('.',
'->') '->')
right_expr_str := g.write_expr_to_string(infix_expr.right).replace('.', right_expr_str := g.write_expr_to_string(infix_expr.right).replace_once('.',
'->') '->')
g.definitions.writeln('$field_type a_ = $left_expr_str;') g.definitions.writeln('$field_type a_ = $left_expr_str;')
g.definitions.writeln('$field_type b_ = $right_expr_str;') g.definitions.writeln('$field_type b_ = $right_expr_str;')
@ -4924,7 +4923,6 @@ fn (mut g Gen) gen_array_sort(node ast.CallExpr) {
g.definitions.writeln('if ($op2) return 1; return 0; }\n') g.definitions.writeln('if ($op2) return 1; return 0; }\n')
} }
} }
}
if is_reverse && !compare_fn.ends_with('_reverse') { if is_reverse && !compare_fn.ends_with('_reverse') {
compare_fn += '_reverse' compare_fn += '_reverse'
} }

23
vlib/v/tests/sorting_by_different_criteria_test.v 100644
View File

@ -0,0 +1,23 @@
struct Child {
f f64
}
struct Parent {
child Child
name string
}
fn test_sorting_by_different_criteria_in_same_function() {
mut arr := [
Parent{Child{0.2}, 'def'},
Parent{Child{0.1}, 'xyz'},
Parent{Child{0.3}, 'abc'},
]
assert arr[0].name == 'def'
arr.sort(a.name < b.name)
// println(arr)
assert arr[0].name == 'abc'
// println(arr)
arr.sort(a.child.f < b.child.f)
assert arr[0].name == 'xyz'
}