| To: vim_dev@googlegroups.com |
| Subject: Patch 7.4.341 |
| Fcc: outbox |
| From: Bram Moolenaar <Bram@moolenaar.net> |
| Mime-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| |
| Patch 7.4.341 |
| Problem: sort() doesn't handle numbers well. |
| Solution: Add an argument to specify sorting on numbers. (Christian Brabandt) |
| Files: runtime/doc/eval.txt, src/eval.c, src/testdir/test55.in, |
| src/testdir/test55.ok |
| |
| |
| |
| |
| |
| *** 5618,5628 **** |
| |
| If you want a list to remain unmodified make a copy first: > |
| :let sortedlist = sort(copy(mylist)) |
| - < Uses the string representation of each item to sort on. |
| - Numbers sort after Strings, |Lists| after Numbers. |
| - For sorting text in the current buffer use |:sort|. |
| |
| ! When {func} is given and it is one then case is ignored. |
| When {func} is a |Funcref| or a function name, this function |
| is called to compare items. The function is invoked with two |
| items as argument and must return zero if they are equal, 1 or |
| --- 5628,5647 ---- |
| |
| If you want a list to remain unmodified make a copy first: > |
| :let sortedlist = sort(copy(mylist)) |
| |
| ! < When {func} is omitted, is empty or zero, then sort() uses the |
| ! string representation of each item to sort on. Numbers sort |
| ! after Strings, |Lists| after Numbers. For sorting text in the |
| ! current buffer use |:sort|. |
| ! |
| ! When {func} is given and it is is '1' or 'i' then case is |
| ! ignored. |
| ! |
| ! When {func} is given and it is 'n' then all items will be |
| ! sorted numerical (Implementation detail: This uses the |
| ! strtod() function to parse numbers, Strings, Lists, Dicts and |
| ! Funcrefs will be considered as being 0). |
| ! |
| When {func} is a |Funcref| or a function name, this function |
| is called to compare items. The function is invoked with two |
| items as argument and must return zero if they are equal, 1 or |
| |
| |
| |
| *** 17330,17335 **** |
| --- 17330,17336 ---- |
| 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,17368 **** |
| p1 = (char_u *)""; |
| if (p2 == NULL) |
| p2 = (char_u *)""; |
| ! if (item_compare_ic) |
| ! res = STRICMP(p1, p2); |
| else |
| ! res = STRCMP(p1, p2); |
| vim_free(tofree1); |
| vim_free(tofree2); |
| return res; |
| --- 17360,17379 ---- |
| p1 = (char_u *)""; |
| if (p2 == NULL) |
| p2 = (char_u *)""; |
| ! if (!item_compare_numeric) |
| ! { |
| ! if (item_compare_ic) |
| ! res = STRICMP(p1, p2); |
| ! else |
| ! res = STRCMP(p1, p2); |
| ! } |
| else |
| ! { |
| ! 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,17444 **** |
| --- 17450,17456 ---- |
| 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,17462 **** |
| --- 17469,17487 ---- |
| 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) |
| |
| |
| |
| *** 332,337 **** |
| --- 332,342 ---- |
| :$put =string(reverse(sort(l))) |
| :$put =string(sort(reverse(sort(l)))) |
| :$put =string(uniq(sort(l))) |
| + :let l=[7, 9, 18, 12, 22, 10.0e-16, -1, 0xff, 0, -0, 0.22, 'foo', 'FOOBAR',{}, []] |
| + :$put =string(sort(copy(l), 'n')) |
| + :$put =string(sort(copy(l), 1)) |
| + :$put =string(sort(copy(l), 'i')) |
| + :$put =string(sort(copy(l))) |
| :" |
| :" splitting a string to a List |
| :$put =string(split(' aa bb ')) |
| |
| |
| |
| *** 101,106 **** |
| --- 101,110 ---- |
| [[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', ''] |
| |
| |
| |
| *** 736,737 **** |
| --- 736,739 ---- |
| { /* Add new patch number below this line */ |
| + /**/ |
| + 341, |
| /**/ |
| |
| -- |
| We do not stumble over mountains, but over molehills. |
| Confucius |
| |
| /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ |
| /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ |
| \\\ an exciting new programming language -- http://www.Zimbu.org /// |
| \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |