diff options
| author | ZyX <kp-pav@yandex.ru> | 2016-05-09 20:04:22 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2016-06-24 16:53:26 +0300 |
| commit | f2f9ab6f3578447a1c30988f5e9930a655277202 (patch) | |
| tree | 36d1a1d66b3cef3387be3c1acf14528e41ea0b03 /src/nvim/eval/encode.c | |
| parent | e07da3a71ba2586b0919ba4517de6e5b056f3b37 (diff) | |
| download | rneovim-f2f9ab6f3578447a1c30988f5e9930a655277202.tar.gz rneovim-f2f9ab6f3578447a1c30988f5e9930a655277202.tar.bz2 rneovim-f2f9ab6f3578447a1c30988f5e9930a655277202.zip | |
eval: Also make clear_tv non-recursive
Diffstat (limited to 'src/nvim/eval/encode.c')
| -rw-r--r-- | src/nvim/eval/encode.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/eval/encode.c b/src/nvim/eval/encode.c index 771655fee5..670437ceda 100644 --- a/src/nvim/eval/encode.c +++ b/src/nvim/eval/encode.c @@ -344,7 +344,7 @@ int encode_read_from_list(ListReaderState *const state, char *const buf, #define TYPVAL_ENCODE_CONV_DICT_BETWEEN_ITEMS() \ ga_concat(gap, ", ") -#define TYPVAL_ENCODE_CONV_SPECIAL_DICT_KEY_CHECK(label, kv_pair) +#define TYPVAL_ENCODE_CONV_SPECIAL_DICT_KEY_CHECK(label, key) #define TYPVAL_ENCODE_CONV_LIST_END() \ ga_append(gap, ']') @@ -696,9 +696,9 @@ bool encode_check_json_key(const typval_T *const tv) } #undef TYPVAL_ENCODE_CONV_SPECIAL_DICT_KEY_CHECK -#define TYPVAL_ENCODE_CONV_SPECIAL_DICT_KEY_CHECK(label, kv_pair) \ +#define TYPVAL_ENCODE_CONV_SPECIAL_DICT_KEY_CHECK(label, key) \ do { \ - if (!encode_check_json_key(&kv_pair->lv_first->li_tv)) { \ + if (!encode_check_json_key(&key)) { \ EMSG(_("E474: Invalid key in special dictionary")); \ goto label; \ } \ @@ -873,7 +873,7 @@ char *encode_tv2json(typval_T *tv, size_t *len) #define TYPVAL_ENCODE_CONV_DICT_BETWEEN_ITEMS() -#define TYPVAL_ENCODE_CONV_SPECIAL_DICT_KEY_CHECK(label, kv_pair) +#define TYPVAL_ENCODE_CONV_SPECIAL_DICT_KEY_CHECK(label, key) #define TYPVAL_ENCODE_CONV_LIST_END() |