mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-08-28 10:01:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.2.0945: sort() with a numeric option can be improved

Browse Source 
Problem:  The comments on the precomputed sort keys explain the code by
          contrasting it with the previous implementation, and one of
          them exceeds 80 columns (after v9.2.0937).
Solution: Drop the redundant comments and shorten the union member ones
          (Hirohito Higashi).

related: vim/vim#21003
closes:  vim/vim#21030

722f4292e5

Co-authored-by: Hirohito Higashi <h.east.727@gmail.com>
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
zeertzjq
2026-08-13 07:42:04 +08:00
parent a63393396c
commit 5e0d4ba389
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/nvim/eval/typval.c
View File

@@ -59,13 +59,12 @@ typedef struct {
typedef struct {
listitem_T *item; ///< Sorted list item.
int idx; ///< Sorted list item index.
/// Sort key precomputed once per item for the numeric compare modes, so
/// item_compare() does not convert the value on every comparison. Only
/// valid when sortinfo->item_compare_keys_ready is set (the sort() path);
/// uniq() passes a bare listitem_T pointer and must not read this.
/// Sort key precomputed once per item for the numeric compare modes.
/// Only valid when sortinfo->item_compare_keys_ready is set (the sort()
/// path); uniq() passes a bare listitem_T pointer and must not read this.
union {
varnumber_T inum; ///< for item_compare_numbers ("N")
double fnum; ///< for item_compare_numeric ("n") and _float ("f")
varnumber_T inum; ///< for "N"
double fnum; ///< for "n" and "f"
} key;
} ListSortItem;
@@ -1369,10 +1368,8 @@ static int item_compare2_not_keeping_zero(const void *s1, const void *s2)
return item_compare2(s1, s2, false);
}
/// Precompute the numeric sort key of each item, so that item_compare() can
/// compare the stored value instead of converting the item on every one of the
/// O(n log n) comparisons. Only for the builtin numeric compare modes; each
/// key is computed exactly as item_compare() would have, once per item.
/// Precompute the numeric sort key of each item. Only for the builtin numeric
/// compare modes; each key is computed exactly as item_compare() would have.
static void sort_compute_keys(ListSortItem *ptrs, int len, sortinfo_T *info)
{
if (info->item_compare_numbers) {
@@ -1388,7 +1385,7 @@ static void sort_compute_keys(ListSortItem *ptrs, int len, sortinfo_T *info)
typval_T *tv = &ptrs[i].item->li_tv;
// A string is compared as a single quote in numeric mode, which
// strtod() reads as 0; only numbers contribute a value.
// strtod() reads as 0.
if (tv->v_type == VAR_STRING) {
ptrs[i].key.fnum = 0.0;
} else {
@@ -1419,8 +1416,7 @@ static void do_sort(list_T *l, sortinfo_T *info)
info->item_compare_func_err = false;
info->item_compare_keys_ready = false;
// For the builtin numeric compares, precompute each item's key once
// instead of converting it on every comparison.
if (info->item_compare_func == NULL && info->item_compare_partial == NULL
&& (info->item_compare_numbers || info->item_compare_float
|| info->item_compare_numeric)) {