Mercurial > vim

comparison src/eval.c @ 26534:28745eec1dda v8.2.3796

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.3796: the funcexe_T struct members are not named consistently Commit: https://github.com/vim/vim/commit/851f86b951cdd67ad9cf3149e46169d1375c8d82 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Dec 13 14:26:44 2021 +0000 patch 8.2.3796: the funcexe_T struct members are not named consistently Problem: The funcexe_T struct members are not named consistently. Solution: Prefix "fe_" to all the members.
author Bram Moolenaar <Bram@vim.org>
date Mon, 13 Dec 2021 15:30:03 +0100
parents 13ba00ef7687
children dff04b7fa6b2
comparison
equal deleted inserted replaced
26533:88b2affbddd9 26534:28745eec1dda
254 { 254 {
255 s = expr->vval.v_string; 255 s = expr->vval.v_string;
256 if (s == NULL || *s == NUL) 256 if (s == NULL || *s == NUL)
257 return FAIL; 257 return FAIL;
258 CLEAR_FIELD(funcexe); 258 CLEAR_FIELD(funcexe);
259 funcexe.evaluate = TRUE; 259 funcexe.fe_evaluate = TRUE;
260 if (call_func(s, -1, rettv, argc, argv, &funcexe) == FAIL) 260 if (call_func(s, -1, rettv, argc, argv, &funcexe) == FAIL)
261 return FAIL; 261 return FAIL;
262 } 262 }
263 else if (expr->v_type == VAR_PARTIAL) 263 else if (expr->v_type == VAR_PARTIAL)
264 { 264 {
278 { 278 {
279 s = partial_name(partial); 279 s = partial_name(partial);
280 if (s == NULL || *s == NUL) 280 if (s == NULL || *s == NUL)
281 return FAIL; 281 return FAIL;
282 CLEAR_FIELD(funcexe); 282 CLEAR_FIELD(funcexe);
283 funcexe.evaluate = TRUE; 283 funcexe.fe_evaluate = TRUE;
284 funcexe.partial = partial; 284 funcexe.fe_partial = partial;
285 if (call_func(s, -1, rettv, argc, argv, &funcexe) == FAIL) 285 if (call_func(s, -1, rettv, argc, argv, &funcexe) == FAIL)
286 return FAIL; 286 return FAIL;
287 } 287 }
288 } 288 }
289 else if (expr->v_type == VAR_INSTR) 289 else if (expr->v_type == VAR_INSTR)
642 int ret; 642 int ret;
643 funcexe_T funcexe; 643 funcexe_T funcexe;
644 644
645 rettv->v_type = VAR_UNKNOWN; // clear_tv() uses this 645 rettv->v_type = VAR_UNKNOWN; // clear_tv() uses this
646 CLEAR_FIELD(funcexe); 646 CLEAR_FIELD(funcexe);
647 funcexe.firstline = curwin->w_cursor.lnum; 647 funcexe.fe_firstline = curwin->w_cursor.lnum;
648 funcexe.lastline = curwin->w_cursor.lnum; 648 funcexe.fe_lastline = curwin->w_cursor.lnum;
649 funcexe.evaluate = TRUE; 649 funcexe.fe_evaluate = TRUE;
650 ret = call_func(func, -1, rettv, argc, argv, &funcexe); 650 ret = call_func(func, -1, rettv, argc, argv, &funcexe);
651 if (ret == FAIL) 651 if (ret == FAIL)
652 clear_tv(rettv); 652 clear_tv(rettv);
653 653
654 return ret; 654 return ret;
2007 { 2007 {
2008 funcexe_T funcexe; 2008 funcexe_T funcexe;
2009 2009
2010 // Invoke the function. 2010 // Invoke the function.
2011 CLEAR_FIELD(funcexe); 2011 CLEAR_FIELD(funcexe);
2012 funcexe.firstline = curwin->w_cursor.lnum; 2012 funcexe.fe_firstline = curwin->w_cursor.lnum;
2013 funcexe.lastline = curwin->w_cursor.lnum; 2013 funcexe.fe_lastline = curwin->w_cursor.lnum;
2014 funcexe.evaluate = evaluate; 2014 funcexe.fe_evaluate = evaluate;
2015 funcexe.partial = partial; 2015 funcexe.fe_partial = partial;
2016 funcexe.basetv = basetv; 2016 funcexe.fe_basetv = basetv;
2017 funcexe.check_type = type; 2017 funcexe.fe_check_type = type;
2018 funcexe.fe_found_var = found_var; 2018 funcexe.fe_found_var = found_var;
2019 ret = get_func_tv(s, len, rettv, arg, evalarg, &funcexe); 2019 ret = get_func_tv(s, len, rettv, arg, evalarg, &funcexe);
2020 } 2020 }
2021 vim_free(s); 2021 vim_free(s);
2022 2022
3803 } 3803 }
3804 else 3804 else
3805 s = (char_u *)""; 3805 s = (char_u *)"";
3806 3806
3807 CLEAR_FIELD(funcexe); 3807 CLEAR_FIELD(funcexe);
3808 funcexe.firstline = curwin->w_cursor.lnum; 3808 funcexe.fe_firstline = curwin->w_cursor.lnum;
3809 funcexe.lastline = curwin->w_cursor.lnum; 3809 funcexe.fe_lastline = curwin->w_cursor.lnum;
3810 funcexe.evaluate = evaluate; 3810 funcexe.fe_evaluate = evaluate;
3811 funcexe.partial = pt; 3811 funcexe.fe_partial = pt;
3812 funcexe.selfdict = selfdict; 3812 funcexe.fe_selfdict = selfdict;
3813 funcexe.basetv = basetv; 3813 funcexe.fe_basetv = basetv;
3814 ret = get_func_tv(s, -1, rettv, arg, evalarg, &funcexe); 3814 ret = get_func_tv(s, -1, rettv, arg, evalarg, &funcexe);
3815 3815
3816 theend: 3816 theend:
3817 // Clear the funcref afterwards, so that deleting it while 3817 // Clear the funcref afterwards, so that deleting it while
3818 // evaluating the arguments is possible (see test55). 3818 // evaluating the arguments is possible (see test55).