IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: made eval_lavars_used global

Browse Source
This commit is contained in:
Jakub Łuczyński 2020-02-11 12:18:22 +01:00
parent 9d7ce03ef1
commit 1e0a9b2690
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/eval.c
View File

@ -81,8 +81,8 @@ static ScopeDictDictItem globvars_var;
*/ */
static hashtab_T compat_hashtab; static hashtab_T compat_hashtab;
// Used for checking if local variables or arguments used in a lambda. /// Used for checking if local variables or arguments used in a lambda.
static int *eval_lavars_used = NULL; bool *eval_lavars_used = NULL;
/* /*
* Array to hold the hashtab with variables local to each sourced script. * Array to hold the hashtab with variables local to each sourced script.
@ -8232,7 +8232,7 @@ int get_var_tv(
} }
/// Check if variable "name[len]" is a local variable or an argument. /// Check if variable "name[len]" is a local variable or an argument.
/// If so, "*eval_lavars_used" is set to TRUE. /// If so, "*eval_lavars_used" is set to true.
static void check_vars(const char *name, size_t len) static void check_vars(const char *name, size_t len)
{ {
if (eval_lavars_used == NULL) { if (eval_lavars_used == NULL) {

3
src/nvim/eval.h
View File

@ -232,6 +232,9 @@ typedef enum {
kDictListItems, ///< List dictionary contents: [keys, values]. kDictListItems, ///< List dictionary contents: [keys, values].
} DictListType; } DictListType;
// Used for checking if local variables or arguments used in a lambda.
extern bool *eval_lavars_used;
#ifdef INCLUDE_GENERATED_DECLARATIONS #ifdef INCLUDE_GENERATED_DECLARATIONS
# include "eval.h.generated.h" # include "eval.h.generated.h"
#endif #endif

4
src/nvim/eval/user_funcs.c
View File

@ -159,8 +159,8 @@ int get_lambda_tv(char_u **arg, typval_T *rettv, bool evaluate)
char_u *start = skipwhite(*arg + 1); char_u *start = skipwhite(*arg + 1);
char_u *s, *e; char_u *s, *e;
static int lambda_no = 0; static int lambda_no = 0;
int *old_eval_lavars = eval_lavars_used; bool *old_eval_lavars = eval_lavars_used;
int eval_lavars = false; bool eval_lavars = false;
// First, check if this is a lambda expression. "->" must exists. // First, check if this is a lambda expression. "->" must exists.
ret = get_function_args(&start, '-', NULL, NULL, true); ret = get_function_args(&start, '-', NULL, NULL, true);