updated for version 7.4.341
Problem: sort() doesn't handle numbers well.
Solution: Add an argument to specify sorting on numbers. (Christian Brabandt)
diff --git a/src/eval.c b/src/eval.c
index 31f5c91..2aa4e54 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -17330,6 +17330,7 @@
item_compare2 __ARGS((const void *s1, const void *s2));
static int item_compare_ic;
+static int item_compare_numeric;
static char_u *item_compare_func;
static dict_T *item_compare_selfdict;
static int item_compare_func_err;
@@ -17359,10 +17360,20 @@
p1 = (char_u *)"";
if (p2 == NULL)
p2 = (char_u *)"";
- if (item_compare_ic)
- res = STRICMP(p1, p2);
+ if (!item_compare_numeric)
+ {
+ if (item_compare_ic)
+ res = STRICMP(p1, p2);
+ else
+ res = STRCMP(p1, p2);
+ }
else
- res = STRCMP(p1, p2);
+ {
+ double n1, n2;
+ n1 = strtod((char *)p1, (char **)&p1);
+ n2 = strtod((char *)p2, (char **)&p2);
+ res = n1 == n2 ? 0 : n1 > n2 ? 1 : -1;
+ }
vim_free(tofree1);
vim_free(tofree2);
return res;
@@ -17439,6 +17450,7 @@
return; /* short list sorts pretty quickly */
item_compare_ic = FALSE;
+ item_compare_numeric = FALSE;
item_compare_func = NULL;
item_compare_selfdict = NULL;
if (argvars[1].v_type != VAR_UNKNOWN)
@@ -17457,6 +17469,19 @@
item_compare_ic = TRUE;
else
item_compare_func = get_tv_string(&argvars[1]);
+ if (item_compare_func != NULL)
+ {
+ if (STRCMP(item_compare_func, "n") == 0)
+ {
+ item_compare_func = NULL;
+ item_compare_numeric = TRUE;
+ }
+ else if (STRCMP(item_compare_func, "i") == 0)
+ {
+ item_compare_func = NULL;
+ item_compare_ic = TRUE;
+ }
+ }
}
if (argvars[2].v_type != VAR_UNKNOWN)
diff --git a/src/testdir/test55.in b/src/testdir/test55.in
index 85a8063..f12dc2d 100644
--- a/src/testdir/test55.in
+++ b/src/testdir/test55.in
Binary files differ
diff --git a/src/testdir/test55.ok b/src/testdir/test55.ok
index be476e8..901bc94 100644
--- a/src/testdir/test55.ok
+++ b/src/testdir/test55.ok
@@ -101,6 +101,10 @@
[[0, 1, 2], [0, 1, 2], 4, 2, 2, 1.5, 'xaaa', 'x8', 'foo6', 'foo', 'foo', 'A11', '-0']
['-0', 'A11', 'foo', 'foo', 'foo6', 'x8', 'xaaa', 1.5, 2, 2, 4, [0, 1, 2], [0, 1, 2]]
['-0', 'A11', 'foo', 'foo6', 'x8', 'xaaa', 1.5, 2, 4, [0, 1, 2]]
+[-1, 0, 0, 'foo', 'FOOBAR', {}, [], 1.0e-15, 0.22, 7, 9, 12, 18, 22, 255]
+['foo', 'FOOBAR', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}]
+['foo', 'FOOBAR', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}]
+['FOOBAR', 'foo', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}]
['aa', 'bb']
['aa', 'bb']
['', 'aa', 'bb', '']
diff --git a/src/version.c b/src/version.c
index 4b4f826..d6c1eb3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 341,
+/**/
340,
/**/
339,
