diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-12-13 14:26:44 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-12-13 14:26:44 +0000 |
| commit | 851f86b951cdd67ad9cf3149e46169d1375c8d82 (patch) | |
| tree | 345b918abbe1034654b12502e877bebad593c1e5 /src/eval.c | |
| parent | 739f13a55b4982efb37ebc9282e7f79975fff982 (diff) | |
patch 8.2.3796: the funcexe_T struct members are not named consistentlyv8.2.3796
Problem: The funcexe_T struct members are not named consistently.
Solution: Prefix "fe_" to all the members.
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/eval.c b/src/eval.c index 64381f0f3d..b2673dcf21 100644 --- a/src/eval.c +++ b/src/eval.c @@ -256,7 +256,7 @@ eval_expr_typval(typval_T *expr, typval_T *argv, int argc, typval_T *rettv) if (s == NULL || *s == NUL) return FAIL; CLEAR_FIELD(funcexe); - funcexe.evaluate = TRUE; + funcexe.fe_evaluate = TRUE; if (call_func(s, -1, rettv, argc, argv, &funcexe) == FAIL) return FAIL; } @@ -280,8 +280,8 @@ eval_expr_typval(typval_T *expr, typval_T *argv, int argc, typval_T *rettv) if (s == NULL || *s == NUL) return FAIL; CLEAR_FIELD(funcexe); - funcexe.evaluate = TRUE; - funcexe.partial = partial; + funcexe.fe_evaluate = TRUE; + funcexe.fe_partial = partial; if (call_func(s, -1, rettv, argc, argv, &funcexe) == FAIL) return FAIL; } @@ -644,9 +644,9 @@ call_vim_function( rettv->v_type = VAR_UNKNOWN; // clear_tv() uses this CLEAR_FIELD(funcexe); - funcexe.firstline = curwin->w_cursor.lnum; - funcexe.lastline = curwin->w_cursor.lnum; - funcexe.evaluate = TRUE; + funcexe.fe_firstline = curwin->w_cursor.lnum; + funcexe.fe_lastline = curwin->w_cursor.lnum; + funcexe.fe_evaluate = TRUE; ret = call_func(func, -1, rettv, argc, argv, &funcexe); if (ret == FAIL) clear_tv(rettv); @@ -2009,12 +2009,12 @@ eval_func( // Invoke the function. CLEAR_FIELD(funcexe); - funcexe.firstline = curwin->w_cursor.lnum; - funcexe.lastline = curwin->w_cursor.lnum; - funcexe.evaluate = evaluate; - funcexe.partial = partial; - funcexe.basetv = basetv; - funcexe.check_type = type; + funcexe.fe_firstline = curwin->w_cursor.lnum; + funcexe.fe_lastline = curwin->w_cursor.lnum; + funcexe.fe_evaluate = evaluate; + funcexe.fe_partial = partial; + funcexe.fe_basetv = basetv; + funcexe.fe_check_type = type; funcexe.fe_found_var = found_var; ret = get_func_tv(s, len, rettv, arg, evalarg, &funcexe); } @@ -3805,12 +3805,12 @@ call_func_rettv( s = (char_u *)""; CLEAR_FIELD(funcexe); - funcexe.firstline = curwin->w_cursor.lnum; - funcexe.lastline = curwin->w_cursor.lnum; - funcexe.evaluate = evaluate; - funcexe.partial = pt; - funcexe.selfdict = selfdict; - funcexe.basetv = basetv; + funcexe.fe_firstline = curwin->w_cursor.lnum; + funcexe.fe_lastline = curwin->w_cursor.lnum; + funcexe.fe_evaluate = evaluate; + funcexe.fe_partial = pt; + funcexe.fe_selfdict = selfdict; + funcexe.fe_basetv = basetv; ret = get_func_tv(s, -1, rettv, arg, evalarg, &funcexe); theend: |