aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.3.614

Browse Source 
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)
This commit is contained in:
Bram Moolenaar 2012-07-25 16:47:03 +02:00
parent 9bdb9a0987
commit 0cbba94b7e
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/edit.c
View File

@ -3959,7 +3959,7 @@ expand_by_function(type, base)
curbuf_save = curbuf; curbuf_save = curbuf;
/* Call a function, which returns a list or dict. */ /* 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) switch (rettv.v_type)
{ {

19
src/eval.c
View File

@ -1564,11 +1564,12 @@ eval_expr(arg, nextcmd)
* Returns OK or FAIL. * Returns OK or FAIL.
*/ */
int int
call_vim_function(func, argc, argv, safe, rettv) call_vim_function(func, argc, argv, safe, str_arg_only, rettv)
char_u *func; char_u *func;
int argc; int argc;
char_u **argv; char_u **argv;
int safe; /* use the sandbox */ int safe; /* use the sandbox */
int str_arg_only; /* all arguments are strings */
typval_T *rettv; typval_T *rettv;
{ {
typval_T *argvars; typval_T *argvars;
@ -1593,8 +1594,11 @@ call_vim_function(func, argc, argv, safe, rettv)
continue; continue;
} }
/* Recognize a number argument, the others must be strings. */ if (str_arg_only)
vim_str2nr(argv[i], NULL, &len, TRUE, TRUE, &n, NULL); 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])) if (len != 0 && len == (int)STRLEN(argv[i]))
{ {
argvars[i].v_type = VAR_NUMBER; argvars[i].v_type = VAR_NUMBER;
@ -1646,7 +1650,8 @@ call_func_retstr(func, argc, argv, safe)
typval_T rettv; typval_T rettv;
char_u *retval; 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; return NULL;
retval = vim_strsave(get_tv_string(&rettv)); retval = vim_strsave(get_tv_string(&rettv));
@ -1671,7 +1676,8 @@ call_func_retnr(func, argc, argv, safe)
typval_T rettv; typval_T rettv;
long retval; 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; return -1;
retval = get_tv_number_chk(&rettv, NULL); retval = get_tv_number_chk(&rettv, NULL);
@ -1694,7 +1700,8 @@ call_func_retlist(func, argc, argv, safe)
{ {
typval_T rettv; 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; return NULL;
if (rettv.v_type != VAR_LIST) if (rettv.v_type != VAR_LIST)

2
src/proto/eval.pro
View File

@ -23,7 +23,7 @@ int eval_to_number __ARGS((char_u *expr));
list_T *eval_spell_expr __ARGS((char_u *badword, 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)); int get_spellword __ARGS((list_T *list, char_u **pp));
typval_T *eval_expr __ARGS((char_u *arg, char_u **nextcmd)); 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)); 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)); 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)); void *call_func_retlist __ARGS((char_u *func, int argc, char_u **argv, int safe));

2
src/version.c
View File

@ -714,6 +714,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
614,
/**/ /**/
613, 613,
/**/ /**/