0
0
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00

updated for version 7.3.1063

Problem:    Python: Function is not standard.
Solution:   Python patch 22: make Function subclassable. (ZyX)
This commit is contained in:
Bram Moolenaar
2013-05-30 13:14:13 +02:00
parent 78cddbe271
commit 355fd9b468
8 changed files with 133 additions and 45 deletions

View File

@@ -21933,6 +21933,15 @@ free_all_functions()
}
#endif
int
translated_function_exists(name)
char_u *name;
{
if (builtin_function(name))
return find_internal_func(name) >= 0;
return find_func(name) != NULL;
}
/*
* Return TRUE if a function "name" exists.
*/
@@ -21950,12 +21959,7 @@ function_exists(name)
/* Only accept "funcname", "funcname ", "funcname (..." and
* "funcname(...", not "funcname!...". */
if (p != NULL && (*nm == NUL || *nm == '('))
{
if (builtin_function(p))
n = (find_internal_func(p) >= 0);
else
n = (find_func(p) != NULL);
}
n = translated_function_exists(p);
vim_free(p);
return n;
}
@@ -21971,18 +21975,9 @@ get_expanded_name(name, check)
p = trans_function_name(&nm, FALSE, TFN_INT|TFN_QUIET, NULL);
if (p != NULL && *nm == NUL)
{
if (!check)
if (!check || translated_function_exists(p))
return p;
else if (builtin_function(p))
{
if (find_internal_func(p) >= 0)
return p;
}
else
if (find_func(p) != NULL)
return p;
}
vim_free(p);
return NULL;
}