diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-01-07 15:54:46 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-01-07 15:54:55 +0300 |
| commit | 9a09ffa883ea34d07405af9617201958e5a4c861 (patch) | |
| tree | d6b1f02be75d974ce8bd6931fcd98e40f2dd97e5 /src/nvim/eval.c | |
| parent | 88a4820cc9f6764b285eef239e103e4fc39c5667 (diff) | |
| download | rneovim-9a09ffa883ea34d07405af9617201958e5a4c861.tar.gz rneovim-9a09ffa883ea34d07405af9617201958e5a4c861.tar.bz2 rneovim-9a09ffa883ea34d07405af9617201958e5a4c861.zip | |
eval: Fix failing test
Diffstat (limited to 'src/nvim/eval.c')
| -rw-r--r-- | src/nvim/eval.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index a96cc82260..b7a30a4c12 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -19185,9 +19185,9 @@ static inline void _nothing_conv_list_end(typval_T *const tv) } #define TYPVAL_ENCODE_CONV_LIST_END(tv) _nothing_conv_list_end(tv) -static inline int _nothing_conv_dict_start(typval_T *const tv, - dict_T **const dictp, - const void *const nodictvar) +static inline int _nothing_conv_real_dict_after_start( + typval_T *const tv, dict_T **const dictp, const void *const nodictvar, + MPConvStackVal *const mpsv) FUNC_ATTR_ALWAYS_INLINE FUNC_ATTR_WARN_UNUSED_RESULT { if (tv != NULL) { @@ -19196,15 +19196,18 @@ static inline int _nothing_conv_dict_start(typval_T *const tv, if ((const void *)dictp != nodictvar && (*dictp)->dv_refcount > 1) { (*dictp)->dv_refcount--; *dictp = NULL; + mpsv->data.d.todo = 0; return OK; } return NOTDONE; } -#define TYPVAL_ENCODE_CONV_DICT_START(tv, dict, len) \ +#define TYPVAL_ENCODE_CONV_DICT_START(tv, dict, len) + +#define TYPVAL_ENCODE_CONV_REAL_DICT_AFTER_START(tv, dict, mpsv) \ do { \ - if (_nothing_conv_dict_start(tv, (dict_T **)&dict, \ - (void *)&TYPVAL_ENCODE_NODICT_VAR) \ - != NOTDONE) { \ + if (_nothing_conv_real_dict_after_start( \ + tv, (dict_T **)&dict, (void *)&TYPVAL_ENCODE_NODICT_VAR, \ + &mpsv) != NOTDONE) { \ goto typval_encode_stop_converting_one_item; \ } \ } while (0) @@ -19259,6 +19262,7 @@ static inline void _nothing_conv_dict_end(typval_T *const tv, #undef TYPVAL_ENCODE_CONV_LIST_BETWEEN_ITEMS #undef TYPVAL_ENCODE_CONV_LIST_END #undef TYPVAL_ENCODE_CONV_DICT_START +#undef TYPVAL_ENCODE_CONV_REAL_DICT_AFTER_START #undef TYPVAL_ENCODE_SPECIAL_DICT_KEY_CHECK #undef TYPVAL_ENCODE_CONV_DICT_AFTER_KEY #undef TYPVAL_ENCODE_CONV_DICT_BETWEEN_ITEMS |