aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.1.1863: confusing error when using a builtin function as method

Browse Source 
Problem:    Confusing error when using a builtin function as method while it
            does not support that.
Solution:   Add a specific error message.
This commit is contained in:
Bram Moolenaar
2019-08-16 22:22:31 +02:00
parent 9c272a9e52
commit 9174639a82
5 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/evalfunc.c
View File

@@ -1113,8 +1113,10 @@ call_internal_method(
typval_T argv[MAX_FUNC_ARGS + 1]; typval_T argv[MAX_FUNC_ARGS + 1];
fi = find_internal_func(name); fi = find_internal_func(name);
if (fi < 0 || global_functions[fi].f_argtype == 0) if (fi < 0)
return ERROR_UNKNOWN; return ERROR_UNKNOWN;
if (global_functions[fi].f_argtype == 0)
return ERROR_NOTMETHOD;
if (argcount + 1 < global_functions[fi].f_min_argc) if (argcount + 1 < global_functions[fi].f_min_argc)
return ERROR_TOOFEW; return ERROR_TOOFEW;
if (argcount + 1 > global_functions[fi].f_max_argc) if (argcount + 1 > global_functions[fi].f_max_argc)

4
src/testdir/test_method.vim
View File

@@ -134,3 +134,7 @@ func Test_method_lambda()
" todo: lambda accepts more arguments than it consumes " todo: lambda accepts more arguments than it consumes
" call assert_fails('eval "text"->{x -> x .. " extended"}("more")', 'E99:') " call assert_fails('eval "text"->{x -> x .. " extended"}("more")', 'E99:')
endfunc endfunc
func Test_method_not_supported()
call assert_fails('eval 123->changenr()', 'E276:')
endfunc

14
src/userfunc.c
View File

@@ -1678,6 +1678,11 @@ call_func(
case ERROR_UNKNOWN: case ERROR_UNKNOWN:
emsg_funcname(N_("E117: Unknown function: %s"), name); emsg_funcname(N_("E117: Unknown function: %s"), name);
break; break;
case ERROR_NOTMETHOD:
emsg_funcname(
N_("E276: Cannot use function as a method: %s"),
name);
break;
case ERROR_DELETED: case ERROR_DELETED:
emsg_funcname(N_("E933: Function was deleted: %s"), name); emsg_funcname(N_("E933: Function was deleted: %s"), name);
break; break;
@@ -1685,15 +1690,18 @@ call_func(
emsg_funcname((char *)e_toomanyarg, name); emsg_funcname((char *)e_toomanyarg, name);
break; break;
case ERROR_TOOFEW: case ERROR_TOOFEW:
emsg_funcname(N_("E119: Not enough arguments for function: %s"), emsg_funcname(
N_("E119: Not enough arguments for function: %s"),
name); name);
break; break;
case ERROR_SCRIPT: case ERROR_SCRIPT:
emsg_funcname(N_("E120: Using <SID> not in a script context: %s"), emsg_funcname(
N_("E120: Using <SID> not in a script context: %s"),
name); name);
break; break;
case ERROR_DICT: case ERROR_DICT:
emsg_funcname(N_("E725: Calling dict function without Dictionary: %s"), emsg_funcname(
N_("E725: Calling dict function without Dictionary: %s"),
name); name);
break; break;
} }

2
src/version.c
View File

@@ -769,6 +769,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 */
/**/
1863,
/**/ /**/
1862, 1862,
/**/ /**/

1
src/vim.h
View File

@@ -2518,6 +2518,7 @@ typedef enum {
#define ERROR_NONE 5 #define ERROR_NONE 5
#define ERROR_OTHER 6 #define ERROR_OTHER 6
#define ERROR_DELETED 7 #define ERROR_DELETED 7
#define ERROR_NOTMETHOD 8 // function cannot be used as a method
/* flags for find_name_end() */ /* flags for find_name_end() */
#define FNE_INCL_BR 1 /* include [] in name */ #define FNE_INCL_BR 1 /* include [] in name */