adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 9.1.1577: Vim9: no generic support yet

Browse Source 
Problem:  Vim9: no generic support yet
Solution: Add support for generic functions, funcrefs and object/class
          methods (Yegappan Lakshmanan).

closes: #17313

Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Yegappan Lakshmanan
2025-07-21 21:36:08 +02:00
committed by Christian Brabandt
parent b486ed8266
commit 3416cee36f
35 changed files with 5905 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/vim9execute.c
View File

@ -1522,6 +1522,14 @@ call_by_name(
return call_bfunc(func_idx, argcount, ectx);
}
char_u cc = NUL;
char_u *start_bracket = generic_func_find_open_bracket(name);
if (start_bracket != NULL)
{
cc = *start_bracket;
*start_bracket = NUL;
}
ufunc = find_func(name, FALSE);
if (ufunc == NULL)
@ -1533,11 +1541,36 @@ call_by_name(
ufunc = find_func(name, FALSE);
if (vim9_aborting(prev_uncaught_emsg))
{
if (start_bracket != NULL)
*start_bracket = cc;
return FAIL; // bail out if loading the script caused an error
}
}
if (start_bracket != NULL)
*start_bracket = cc;
if (ufunc != NULL)
{
if (IS_GENERIC_FUNC(ufunc))
{
if (start_bracket != NULL)
ufunc = find_generic_func(ufunc, name, &start_bracket);
else
{
emsg_funcname(e_generic_func_missing_type_args_str, name);
ufunc = NULL;
}
if (ufunc == NULL)
return FAIL;
}
else if (start_bracket != NULL)
{
emsg_funcname(e_not_a_generic_function_str, name);
return FAIL;
}
if (check_ufunc_arg_types(ufunc, argcount, 0, ectx) == FAIL)
return FAIL;
@ -5068,7 +5101,7 @@ exec_instructions(ectx_T *ectx)
ea.cmd = ea.arg = iptr->isn_arg.string;
ga_init2(&lines_to_free, sizeof(char_u *), 50);
SOURCING_LNUM = iptr->isn_lnum;
define_function(&ea, NULL, &lines_to_free, 0, NULL, 0);
define_function(&ea, NULL, &lines_to_free, 0, NULL, 0, NULL);
ga_clear_strings(&lines_to_free);
}
break;