mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-20 18:28:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

eval/typval_encode: Rename some \*tv variables

Browse Source 
Renames `tv` function argument to `top_tv` and `cur_tv` variable to `tv`, so 
`tv` will mean something more or less the same in both 
_TYPVAL_ENCODE_CONVERT_ONE_VALUE and _TYPVAL_ENCODE_ENCODE functions.
This commit is contained in:
ZyX
2017-01-03 04:29:25 +03:00
parent e2d81cc479
commit 67b53361ba
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/nvim/eval/typval_encode.c.h
View File

@@ -541,26 +541,26 @@ TYPVAL_ENCODE_SCOPE int _TYPVAL_ENCODE_ENCODE(
/// @param TYPVAL_ENCODE_FIRST_ARG_NAME First argument, defined by the /// @param TYPVAL_ENCODE_FIRST_ARG_NAME First argument, defined by the
/// includer. Only meaningful to macros /// includer. Only meaningful to macros
/// defined by the includer. /// defined by the includer.
/// @param tv Converted value. /// @param top_tv Converted value.
/// @param[in] objname Object name, used for error reporting. /// @param[in] objname Object name, used for error reporting.
/// ///
/// @return OK in case of success, FAIL in case of failure. /// @return OK in case of success, FAIL in case of failure.
TYPVAL_ENCODE_SCOPE int _TYPVAL_ENCODE_ENCODE( TYPVAL_ENCODE_SCOPE int _TYPVAL_ENCODE_ENCODE(
TYPVAL_ENCODE_FIRST_ARG_TYPE TYPVAL_ENCODE_FIRST_ARG_NAME, TYPVAL_ENCODE_FIRST_ARG_TYPE TYPVAL_ENCODE_FIRST_ARG_NAME,
typval_T *const tv, const char *const objname) typval_T *const top_tv, const char *const objname)
{ {
const int copyID = get_copyID(); const int copyID = get_copyID();
MPConvStack mpstack; MPConvStack mpstack;
_mp_init(mpstack); _mp_init(mpstack);
if (_TYPVAL_ENCODE_CONVERT_ONE_VALUE(TYPVAL_ENCODE_FIRST_ARG_NAME, &mpstack, if (_TYPVAL_ENCODE_CONVERT_ONE_VALUE(TYPVAL_ENCODE_FIRST_ARG_NAME, &mpstack,
NULL, NULL,
tv, copyID, objname) top_tv, copyID, objname)
== FAIL) { == FAIL) {
goto encode_vim_to__error_ret; goto encode_vim_to__error_ret;
} }
while (_mp_size(mpstack)) { while (_mp_size(mpstack)) {
MPConvStackVal *cur_mpsv = &_mp_last(mpstack); MPConvStackVal *cur_mpsv = &_mp_last(mpstack);
typval_T *cur_tv = NULL; typval_T *tv = NULL;
switch (cur_mpsv->type) { switch (cur_mpsv->type) {
case kMPConvDict: { case kMPConvDict: {
if (!cur_mpsv->data.d.todo) { if (!cur_mpsv->data.d.todo) {
@@ -581,7 +581,7 @@ TYPVAL_ENCODE_SCOPE int _TYPVAL_ENCODE_ENCODE(
TYPVAL_ENCODE_CONV_STR_STRING(&di->di_key[0], TYPVAL_ENCODE_CONV_STR_STRING(&di->di_key[0],
strlen((char *)&di->di_key[0])); strlen((char *)&di->di_key[0]));
TYPVAL_ENCODE_CONV_DICT_AFTER_KEY(); TYPVAL_ENCODE_CONV_DICT_AFTER_KEY();
cur_tv = &di->di_tv; tv = &di->di_tv;
break; break;
} }
case kMPConvList: { case kMPConvList: {
@@ -593,7 +593,7 @@ TYPVAL_ENCODE_SCOPE int _TYPVAL_ENCODE_ENCODE(
} else if (cur_mpsv->data.l.li != cur_mpsv->data.l.list->lv_first) { } else if (cur_mpsv->data.l.li != cur_mpsv->data.l.list->lv_first) {
TYPVAL_ENCODE_CONV_LIST_BETWEEN_ITEMS(); TYPVAL_ENCODE_CONV_LIST_BETWEEN_ITEMS();
} }
cur_tv = &cur_mpsv->data.l.li->li_tv; tv = &cur_mpsv->data.l.li->li_tv;
cur_mpsv->data.l.li = cur_mpsv->data.l.li->li_next; cur_mpsv->data.l.li = cur_mpsv->data.l.li->li_next;
break; break;
} }
@@ -617,7 +617,7 @@ TYPVAL_ENCODE_SCOPE int _TYPVAL_ENCODE_ENCODE(
goto encode_vim_to__error_ret; goto encode_vim_to__error_ret;
} }
TYPVAL_ENCODE_CONV_DICT_AFTER_KEY(); TYPVAL_ENCODE_CONV_DICT_AFTER_KEY();
cur_tv = &kv_pair->lv_last->li_tv; tv = &kv_pair->lv_last->li_tv;
cur_mpsv->data.l.li = cur_mpsv->data.l.li->li_next; cur_mpsv->data.l.li = cur_mpsv->data.l.li->li_next;
break; break;
} }
@@ -692,14 +692,14 @@ TYPVAL_ENCODE_SCOPE int _TYPVAL_ENCODE_ENCODE(
} else if (cur_mpsv->data.a.argv != cur_mpsv->data.a.arg) { } else if (cur_mpsv->data.a.argv != cur_mpsv->data.a.arg) {
TYPVAL_ENCODE_CONV_LIST_BETWEEN_ITEMS(); TYPVAL_ENCODE_CONV_LIST_BETWEEN_ITEMS();
} }
cur_tv = cur_mpsv->data.a.arg++; tv = cur_mpsv->data.a.arg++;
cur_mpsv->data.a.todo--; cur_mpsv->data.a.todo--;
break; break;
} }
} }
assert(cur_tv != NULL); assert(tv != NULL);
if (_TYPVAL_ENCODE_CONVERT_ONE_VALUE(TYPVAL_ENCODE_FIRST_ARG_NAME, &mpstack, if (_TYPVAL_ENCODE_CONVERT_ONE_VALUE(TYPVAL_ENCODE_FIRST_ARG_NAME, &mpstack,
cur_mpsv, cur_tv, copyID, objname) cur_mpsv, tv, copyID, objname)
== FAIL) { == FAIL) {
goto encode_vim_to__error_ret; goto encode_vim_to__error_ret;
} }