To: vim_dev@googlegroups.com Subject: Patch 9.0.0548 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.0548 Problem: reduce() with a compiled lambda could be faster. Solution: Call eval_expr_typval() instead of call_func() directly. Files: src/list.c, src/strings.c, src/proto/strings.pro, src/blob.c, src/proto/blob.pro, src/testdir/test_listdict.vim *** ../vim-9.0.0547/src/list.c 2022-09-17 21:07:52.099993159 +0100 --- src/list.c 2022-09-22 16:59:20.457470271 +0100 *************** *** 2999,3013 **** } /* ! * reduce() List argvars[0] using the function 'funcname' with arguments in ! * 'funcexe' starting with the initial value argvars[2] and return the result ! * in 'rettv'. */ static void list_reduce( typval_T *argvars, ! char_u *func_name, ! funcexe_T *funcexe, typval_T *rettv) { list_T *l = argvars[0].vval.v_list; --- 2999,3012 ---- } /* ! * Implementation of reduce() for list "argvars[0]", using the function "expr" ! * starting with the optional initial value argvars[2] and return the result in ! * "rettv". */ static void list_reduce( typval_T *argvars, ! typval_T *expr, typval_T *rettv) { list_T *l = argvars[0].vval.v_list; *************** *** 3049,3055 **** argv[0] = *rettv; argv[1] = li->li_tv; rettv->v_type = VAR_UNKNOWN; ! r = call_func(func_name, -1, rettv, 2, argv, funcexe); clear_tv(&argv[0]); if (r == FAIL || called_emsg != called_emsg_start) break; --- 3048,3056 ---- argv[0] = *rettv; argv[1] = li->li_tv; rettv->v_type = VAR_UNKNOWN; ! ! r = eval_expr_typval(expr, argv, 2, rettv); ! clear_tv(&argv[0]); if (r == FAIL || called_emsg != called_emsg_start) break; *************** *** 3066,3073 **** f_reduce(typval_T *argvars, typval_T *rettv) { char_u *func_name; - partial_T *partial = NULL; - funcexe_T funcexe; if (in_vim9script() && check_for_string_or_list_or_blob_arg(argvars, 0) == FAIL) --- 3067,3072 ---- *************** *** 3084,3093 **** if (argvars[1].v_type == VAR_FUNC) func_name = argvars[1].vval.v_string; else if (argvars[1].v_type == VAR_PARTIAL) ! { ! partial = argvars[1].vval.v_partial; ! func_name = partial_name(partial); ! } else func_name = tv_get_string(&argvars[1]); if (func_name == NULL || *func_name == NUL) --- 3083,3089 ---- if (argvars[1].v_type == VAR_FUNC) func_name = argvars[1].vval.v_string; else if (argvars[1].v_type == VAR_PARTIAL) ! func_name = partial_name(argvars[1].vval.v_partial); else func_name = tv_get_string(&argvars[1]); if (func_name == NULL || *func_name == NUL) *************** *** 3096,3111 **** return; } - CLEAR_FIELD(funcexe); - funcexe.fe_evaluate = TRUE; - funcexe.fe_partial = partial; - if (argvars[0].v_type == VAR_LIST) ! list_reduce(argvars, func_name, &funcexe, rettv); else if (argvars[0].v_type == VAR_STRING) ! string_reduce(argvars, func_name, &funcexe, rettv); else ! blob_reduce(argvars, func_name, &funcexe, rettv); } #endif // defined(FEAT_EVAL) --- 3092,3103 ---- return; } if (argvars[0].v_type == VAR_LIST) ! list_reduce(argvars, &argvars[1], rettv); else if (argvars[0].v_type == VAR_STRING) ! string_reduce(argvars, &argvars[1], rettv); else ! blob_reduce(argvars, &argvars[1], rettv); } #endif // defined(FEAT_EVAL) *** ../vim-9.0.0547/src/strings.c 2022-09-17 21:07:52.099993159 +0100 --- src/strings.c 2022-09-22 16:58:18.713131540 +0100 *************** *** 932,946 **** } /* ! * reduce() String argvars[0] using the function 'funcname' with arguments in ! * 'funcexe' starting with the initial value argvars[2] and return the result ! * in 'rettv'. */ void string_reduce( typval_T *argvars, ! char_u *func_name, ! funcexe_T *funcexe, typval_T *rettv) { char_u *p = tv_get_string(&argvars[0]); --- 932,945 ---- } /* ! * Implementation of reduce() for String "argvars[0]" using the function "expr" ! * starting with the optional initial value "argvars[2]" and return the result ! * in "rettv". */ void string_reduce( typval_T *argvars, ! typval_T *expr, typval_T *rettv) { char_u *p = tv_get_string(&argvars[0]); *************** *** 971,977 **** if (copy_first_char_to_tv(p, &argv[1]) == FAIL) break; len = (int)STRLEN(argv[1].vval.v_string); ! r = call_func(func_name, -1, rettv, 2, argv, funcexe); clear_tv(&argv[0]); clear_tv(&argv[1]); if (r == FAIL || called_emsg != called_emsg_start) --- 970,978 ---- if (copy_first_char_to_tv(p, &argv[1]) == FAIL) break; len = (int)STRLEN(argv[1].vval.v_string); ! ! r = eval_expr_typval(expr, argv, 2, rettv); ! clear_tv(&argv[0]); clear_tv(&argv[1]); if (r == FAIL || called_emsg != called_emsg_start) *** ../vim-9.0.0547/src/proto/strings.pro 2022-06-27 23:15:24.000000000 +0100 --- src/proto/strings.pro 2022-09-22 16:55:17.439867327 +0100 *************** *** 23,29 **** char_u *string_quote(char_u *str, int function); long string_count(char_u *haystack, char_u *needle, int ic); void string_filter_map(char_u *str, filtermap_T filtermap, typval_T *expr, typval_T *rettv); ! void string_reduce(typval_T *argvars, char_u *func_name, funcexe_T *funcexe, typval_T *rettv); void f_byteidx(typval_T *argvars, typval_T *rettv); void f_byteidxcomp(typval_T *argvars, typval_T *rettv); void f_charidx(typval_T *argvars, typval_T *rettv); --- 23,29 ---- char_u *string_quote(char_u *str, int function); long string_count(char_u *haystack, char_u *needle, int ic); void string_filter_map(char_u *str, filtermap_T filtermap, typval_T *expr, typval_T *rettv); ! void string_reduce(typval_T *argvars, typval_T *expr, typval_T *rettv); void f_byteidx(typval_T *argvars, typval_T *rettv); void f_byteidxcomp(typval_T *argvars, typval_T *rettv); void f_charidx(typval_T *argvars, typval_T *rettv); *** ../vim-9.0.0547/src/blob.c 2022-09-02 15:15:11.059569191 +0100 --- src/blob.c 2022-09-22 16:57:24.740800362 +0100 *************** *** 638,652 **** } /* ! * reduce() Blob argvars[0] using the function 'funcname' with arguments in ! * 'funcexe' starting with the initial value argvars[2] and return the result ! * in 'rettv'. */ void blob_reduce( typval_T *argvars, ! char_u *func_name, ! funcexe_T *funcexe, typval_T *rettv) { blob_T *b = argvars[0].vval.v_blob; --- 638,651 ---- } /* ! * Implementaion of reduce() for Blob "argvars[0]" using the function "expr" ! * starting with the optional initial value "argvars[2]" and return the result ! * in "rettv". */ void blob_reduce( typval_T *argvars, ! typval_T *expr, typval_T *rettv) { blob_T *b = argvars[0].vval.v_blob; *************** *** 684,690 **** argv[0] = *rettv; argv[1].v_type = VAR_NUMBER; argv[1].vval.v_number = blob_get(b, i); ! r = call_func(func_name, -1, rettv, 2, argv, funcexe); clear_tv(&argv[0]); if (r == FAIL || called_emsg != called_emsg_start) return; --- 683,691 ---- argv[0] = *rettv; argv[1].v_type = VAR_NUMBER; argv[1].vval.v_number = blob_get(b, i); ! ! r = eval_expr_typval(expr, argv, 2, rettv); ! clear_tv(&argv[0]); if (r == FAIL || called_emsg != called_emsg_start) return; *** ../vim-9.0.0547/src/proto/blob.pro 2021-12-22 18:04:56.000000000 +0000 --- src/proto/blob.pro 2022-09-22 16:57:28.528824752 +0100 *************** *** 22,28 **** void blob_remove(typval_T *argvars, typval_T *rettv, char_u *arg_errmsg); void blob_filter_map(blob_T *blob_arg, filtermap_T filtermap, typval_T *expr, typval_T *rettv); void blob_insert_func(typval_T *argvars, typval_T *rettv); ! void blob_reduce(typval_T *argvars, char_u *func_name, funcexe_T *funcexe, typval_T *rettv); void blob_reverse(blob_T *b, typval_T *rettv); void f_blob2list(typval_T *argvars, typval_T *rettv); void f_list2blob(typval_T *argvars, typval_T *rettv); --- 22,28 ---- void blob_remove(typval_T *argvars, typval_T *rettv, char_u *arg_errmsg); void blob_filter_map(blob_T *blob_arg, filtermap_T filtermap, typval_T *expr, typval_T *rettv); void blob_insert_func(typval_T *argvars, typval_T *rettv); ! void blob_reduce(typval_T *argvars, typval_T *expr, typval_T *rettv); void blob_reverse(blob_T *b, typval_T *rettv); void f_blob2list(typval_T *argvars, typval_T *rettv); void f_list2blob(typval_T *argvars, typval_T *rettv); *** ../vim-9.0.0547/src/testdir/test_listdict.vim 2022-09-17 21:07:52.107993141 +0100 --- src/testdir/test_listdict.vim 2022-09-22 16:56:08.580270027 +0100 *************** *** 1045,1051 **** call assert_fails("call reduce({}, { acc, val -> acc + val }, 1)", 'E1098:') call assert_fails("call reduce(0, { acc, val -> acc + val }, 1)", 'E1098:') ! call assert_fails("call reduce([1, 2], 'Xdoes_not_exist')", 'E117:') call assert_fails("echo reduce(0z01, { acc, val -> 2 * acc + val }, '')", 'E1210:') call assert_fails("vim9 reduce(0, (acc, val) => (acc .. val), '')", 'E1252:') --- 1045,1051 ---- call assert_fails("call reduce({}, { acc, val -> acc + val }, 1)", 'E1098:') call assert_fails("call reduce(0, { acc, val -> acc + val }, 1)", 'E1098:') ! call assert_fails("call reduce([1, 2], 'Xdoes_not_exist')", 'E121:') call assert_fails("echo reduce(0z01, { acc, val -> 2 * acc + val }, '')", 'E1210:') call assert_fails("vim9 reduce(0, (acc, val) => (acc .. val), '')", 'E1252:') *** ../vim-9.0.0547/src/version.c 2022-09-22 16:36:21.912930258 +0100 --- src/version.c 2022-09-22 16:54:55.879685212 +0100 *************** *** 701,702 **** --- 701,704 ---- { /* Add new patch number below this line */ + /**/ + 548, /**/ -- Never eat yellow snow. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///