Mercurial > vim
changeset 3709:2bb51730ef4b v7.3.614
updated for version 7.3.614
Problem: Number argument gets turned into a number while it should be a
string.
Solution: Add flag to the call_vim_function() call. (Yasuhiro Matsumoto)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Wed, 25 Jul 2012 16:47:03 +0200 |
| parents | 1deb3f8e60ba |
| children | 40b720ad5b7e |
| files | src/edit.c src/eval.c src/proto/eval.pro src/version.c |
| diffstat | 4 files changed, 17 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/edit.c +++ b/src/edit.c @@ -3959,7 +3959,7 @@ expand_by_function(type, base) curbuf_save = curbuf; /* Call a function, which returns a list or dict. */ - if (call_vim_function(funcname, 2, args, FALSE, &rettv) == OK) + if (call_vim_function(funcname, 2, args, FALSE, FALSE, &rettv) == OK) { switch (rettv.v_type) {
--- a/src/eval.c +++ b/src/eval.c @@ -1564,11 +1564,12 @@ eval_expr(arg, nextcmd) * Returns OK or FAIL. */ int -call_vim_function(func, argc, argv, safe, rettv) +call_vim_function(func, argc, argv, safe, str_arg_only, rettv) char_u *func; int argc; char_u **argv; int safe; /* use the sandbox */ + int str_arg_only; /* all arguments are strings */ typval_T *rettv; { typval_T *argvars; @@ -1593,8 +1594,11 @@ call_vim_function(func, argc, argv, safe continue; } - /* Recognize a number argument, the others must be strings. */ - vim_str2nr(argv[i], NULL, &len, TRUE, TRUE, &n, NULL); + if (str_arg_only) + len = 0; + else + /* Recognize a number argument, the others must be strings. */ + vim_str2nr(argv[i], NULL, &len, TRUE, TRUE, &n, NULL); if (len != 0 && len == (int)STRLEN(argv[i])) { argvars[i].v_type = VAR_NUMBER; @@ -1646,7 +1650,8 @@ call_func_retstr(func, argc, argv, safe) typval_T rettv; char_u *retval; - if (call_vim_function(func, argc, argv, safe, &rettv) == FAIL) + /* All arguments are passed as strings, no conversion to number. */ + if (call_vim_function(func, argc, argv, safe, TRUE, &rettv) == FAIL) return NULL; retval = vim_strsave(get_tv_string(&rettv)); @@ -1671,7 +1676,8 @@ call_func_retnr(func, argc, argv, safe) typval_T rettv; long retval; - if (call_vim_function(func, argc, argv, safe, &rettv) == FAIL) + /* All arguments are passed as strings, no conversion to number. */ + if (call_vim_function(func, argc, argv, safe, TRUE, &rettv) == FAIL) return -1; retval = get_tv_number_chk(&rettv, NULL); @@ -1694,7 +1700,8 @@ call_func_retlist(func, argc, argv, safe { typval_T rettv; - if (call_vim_function(func, argc, argv, safe, &rettv) == FAIL) + /* All arguments are passed as strings, no conversion to number. */ + if (call_vim_function(func, argc, argv, safe, TRUE, &rettv) == FAIL) return NULL; if (rettv.v_type != VAR_LIST)
--- a/src/proto/eval.pro +++ b/src/proto/eval.pro @@ -23,7 +23,7 @@ int eval_to_number __ARGS((char_u *expr) list_T *eval_spell_expr __ARGS((char_u *badword, char_u *expr)); int get_spellword __ARGS((list_T *list, char_u **pp)); typval_T *eval_expr __ARGS((char_u *arg, char_u **nextcmd)); -int call_vim_function __ARGS((char_u *func, int argc, char_u **argv, int safe, typval_T *rettv)); +int call_vim_function __ARGS((char_u *func, int argc, char_u **argv, int safe, int str_arg_only, typval_T *rettv)); void *call_func_retstr __ARGS((char_u *func, int argc, char_u **argv, int safe)); long call_func_retnr __ARGS((char_u *func, int argc, char_u **argv, int safe)); void *call_func_retlist __ARGS((char_u *func, int argc, char_u **argv, int safe));