thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.1.1169: using global variable for get_insert()/get_lambda_name()

Browse Source 
Problem:  using global variable for get_insert()/get_lambda_name()
          (after v9.1.1151)
Solution: let the functions return a string_T object instead
          (Yee Cheng Chin)

In #16720, `get_insert()` was modified to store a string length in a
global variable to be queried immediately by another `get_insert_len()`
function, which is somewhat fragile. Instead, just have the function
itself return a `string_T` object instead. Also do the same for
`get_lambda_name()` which has similar issues.

closes: #16775

Signed-off-by: Yee Cheng Chin <ychin.git@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Yee Cheng Chin
2025-03-03 20:12:05 +01:00
committed by Christian Brabandt
parent d2219d547d
commit 0b5fe42071
7 changed files with 40 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/vim9compile.c
View File

@@ -1033,8 +1033,7 @@ compile_nested_function(exarg_T *eap, cctx_T *cctx, garray_T *lines_to_free)
char_u *name_end = to_name_end(eap->arg, TRUE);
int off;
char_u *func_name;
char_u *lambda_name;
size_t lambda_namelen;
string_T lambda_name;
ufunc_T *ufunc;
int r = FAIL;
compiletype_T compile_type;
@@ -1094,9 +1093,8 @@ compile_nested_function(exarg_T *eap, cctx_T *cctx, garray_T *lines_to_free)
eap->forceit = FALSE;
// We use the special <Lamba>99 name, but it's not really a lambda.
lambda_name = get_lambda_name();
lambda_namelen = get_lambda_name_len();
lambda_name = vim_strnsave(lambda_name, lambda_namelen);
if (lambda_name == NULL)
lambda_name.string = vim_strnsave(lambda_name.string, lambda_name.length);
if (lambda_name.string == NULL)
return NULL;
// This may free the current line, make a copy of the name.
@@ -1112,7 +1110,7 @@ compile_nested_function(exarg_T *eap, cctx_T *cctx, garray_T *lines_to_free)
int save_KeyTyped = KeyTyped;
KeyTyped = FALSE;
ufunc = define_function(eap, lambda_name, lines_to_free, 0, NULL, 0);
ufunc = define_function(eap, lambda_name.string, lines_to_free, 0, NULL, 0);
KeyTyped = save_KeyTyped;
@@ -1148,9 +1146,10 @@ compile_nested_function(exarg_T *eap, cctx_T *cctx, garray_T *lines_to_free)
// recursive call.
if (is_global)
{
r = generate_NEWFUNC(cctx, lambda_name, func_name);
r = generate_NEWFUNC(cctx, lambda_name.string, func_name);
func_name = NULL;
lambda_name = NULL;
lambda_name.string = NULL;
lambda_name.length = 0;
}
else
{
@@ -1197,7 +1196,7 @@ compile_nested_function(exarg_T *eap, cctx_T *cctx, garray_T *lines_to_free)
}
theend:
vim_free(lambda_name);
vim_free(lambda_name.string);
vim_free(func_name);
return r == FAIL ? NULL : (char_u *)"";
}