IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

eval/typval_encode: Use TYPVAL_ENCODE_CONV_EMPTY_DICT for partials

Browse Source
This commit is contained in:
ZyX 2017-01-06 22:48:50 +03:00
parent 7f11ec00fd
commit 6584fb723a
4 changed files with 40 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/api/private/helpers.c
View File

@ -369,7 +369,7 @@ void set_option_to(void *to, int type, String name, Object value, Error *err)
#define TYPVAL_ENCODE_CONV_EMPTY_LIST(tv) \ #define TYPVAL_ENCODE_CONV_EMPTY_LIST(tv) \
kv_push(edata->stack, ARRAY_OBJ(((Array) { .capacity = 0, .size = 0 }))) kv_push(edata->stack, ARRAY_OBJ(((Array) { .capacity = 0, .size = 0 })))
#define TYPVAL_ENCODE_CONV_EMPTY_DICT(tv) \ #define TYPVAL_ENCODE_CONV_EMPTY_DICT(tv, dict) \
kv_push(edata->stack, \ kv_push(edata->stack, \
DICTIONARY_OBJ(((Dictionary) { .capacity = 0, .size = 0 }))) DICTIONARY_OBJ(((Dictionary) { .capacity = 0, .size = 0 })))

11
src/nvim/eval.c
View File

@ -19127,11 +19127,14 @@ static inline void _nothing_conv_func_end(typval_T *const tv)
tv->v_lock = VAR_UNLOCKED; \ tv->v_lock = VAR_UNLOCKED; \
} while (0) } while (0)
#define TYPVAL_ENCODE_CONV_EMPTY_DICT(tv) \ #define TYPVAL_ENCODE_CONV_EMPTY_DICT(tv, dict) \
do { \ do { \
dict_unref(tv->vval.v_dict); \ assert((void *)&dict != (void *)&TYPVAL_ENCODE_NODICT_VAR); \
tv->vval.v_dict = NULL; \ dict_unref((dict_T *)dict); \
tv->v_lock = VAR_UNLOCKED; \ *((dict_T **)&dict) = NULL; \
if (tv != NULL) { \
((typval_T *)tv)->v_lock = VAR_UNLOCKED; \
} \
} while (0) } while (0)
static inline int _nothing_conv_list_start(typval_T *const tv) static inline int _nothing_conv_list_start(typval_T *const tv)

4
src/nvim/eval/encode.c
View File

@ -369,7 +369,7 @@ int encode_read_from_list(ListReaderState *const state, char *const buf,
#define TYPVAL_ENCODE_CONV_LIST_START(tv, len) \ #define TYPVAL_ENCODE_CONV_LIST_START(tv, len) \
ga_append(gap, '[') ga_append(gap, '[')
#define TYPVAL_ENCODE_CONV_EMPTY_DICT(tv) \ #define TYPVAL_ENCODE_CONV_EMPTY_DICT(tv, dict) \
ga_concat(gap, "{}") ga_concat(gap, "{}")
#define TYPVAL_ENCODE_CONV_NIL(tv) \ #define TYPVAL_ENCODE_CONV_NIL(tv) \
@ -933,7 +933,7 @@ char *encode_tv2json(typval_T *tv, size_t *len)
#define TYPVAL_ENCODE_CONV_LIST_START(tv, len) \ #define TYPVAL_ENCODE_CONV_LIST_START(tv, len) \
msgpack_pack_array(packer, (size_t)(len)) msgpack_pack_array(packer, (size_t)(len))
#define TYPVAL_ENCODE_CONV_EMPTY_DICT(tv) \ #define TYPVAL_ENCODE_CONV_EMPTY_DICT(tv, dict) \
msgpack_pack_map(packer, 0) msgpack_pack_map(packer, 0)
#define TYPVAL_ENCODE_CONV_NIL(tv) \ #define TYPVAL_ENCODE_CONV_NIL(tv) \

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

@ -117,8 +117,10 @@
/// @def TYPVAL_ENCODE_CONV_EMPTY_DICT /// @def TYPVAL_ENCODE_CONV_EMPTY_DICT
/// @brief Macros used to convert an empty dictionary /// @brief Macros used to convert an empty dictionary
/// ///
/// @param tv Pointer to typval where value is stored. May not be NULL. May /// @param tv Pointer to typval where value is stored. May be NULL. May
/// point to a special dictionary. /// point to a special dictionary.
/// @param dict Converted dictionary, lvalue or #TYPVAL_ENCODE_NODICT_VAR
/// (for dictionaries represented as special lists).
/// @def TYPVAL_ENCODE_CONV_LIST_START /// @def TYPVAL_ENCODE_CONV_LIST_START
/// @brief Macros used before starting to convert non-empty list /// @brief Macros used before starting to convert non-empty list
@ -142,7 +144,7 @@
/// ///
/// @param tv Pointer to typval where dictionary is stored. May be NULL. May /// @param tv Pointer to typval where dictionary is stored. May be NULL. May
/// point to a special dictionary. /// point to a special dictionary.
/// @param dict Converted dictionary, lvalue or &#TYPVAL_ENCODE_NODICT_VAR /// @param dict Converted dictionary, lvalue or #TYPVAL_ENCODE_NODICT_VAR
/// (for dictionaries represented as special lists). /// (for dictionaries represented as special lists).
/// @param len Dictionary length. Is an expression which evaluates to an /// @param len Dictionary length. Is an expression which evaluates to an
/// integer. /// integer.
@ -158,7 +160,7 @@
/// ///
/// @param tv Pointer to typval where dictionary is stored. May be NULL. May /// @param tv Pointer to typval where dictionary is stored. May be NULL. May
/// point to a special dictionary. /// point to a special dictionary.
/// @param dict Converted dictionary, lvalue or &#TYPVAL_ENCODE_NODICT_VAR /// @param dict Converted dictionary, lvalue or #TYPVAL_ENCODE_NODICT_VAR
/// (for dictionaries represented as special lists). /// (for dictionaries represented as special lists).
/// @def TYPVAL_ENCODE_CONV_DICT_BETWEEN_ITEMS /// @def TYPVAL_ENCODE_CONV_DICT_BETWEEN_ITEMS
@ -166,7 +168,7 @@
/// ///
/// @param tv Pointer to typval where dictionary is stored. May be NULL. May /// @param tv Pointer to typval where dictionary is stored. May be NULL. May
/// point to a special dictionary. /// point to a special dictionary.
/// @param dict Converted dictionary, lvalue or &#TYPVAL_ENCODE_NODICT_VAR /// @param dict Converted dictionary, lvalue or #TYPVAL_ENCODE_NODICT_VAR
/// (for dictionaries represented as special lists). /// (for dictionaries represented as special lists).
/// @def TYPVAL_ENCODE_CONV_DICT_END /// @def TYPVAL_ENCODE_CONV_DICT_END
@ -174,7 +176,7 @@
/// ///
/// @param tv Pointer to typval where dictionary is stored. May be NULL. May /// @param tv Pointer to typval where dictionary is stored. May be NULL. May
/// point to a special dictionary. /// point to a special dictionary.
/// @param dict Converted dictionary, lvalue or &#TYPVAL_ENCODE_NODICT_VAR /// @param dict Converted dictionary, lvalue or #TYPVAL_ENCODE_NODICT_VAR
/// (for dictionaries represented as special lists). /// (for dictionaries represented as special lists).
/// @def TYPVAL_ENCODE_CONV_RECURSE /// @def TYPVAL_ENCODE_CONV_RECURSE
@ -224,6 +226,10 @@
#include "nvim/func_attr.h" #include "nvim/func_attr.h"
#include "nvim/eval/typval_encode.h" #include "nvim/eval/typval_encode.h"
/// Dummy variable used because some macros need lvalue
///
/// Must not be written to, if needed one must check that address of the
/// macros argument is (not) equal to `&TYPVAL_ENCODE_NODICT_VAR`.
const dict_T *const TYPVAL_ENCODE_NODICT_VAR = NULL; const dict_T *const TYPVAL_ENCODE_NODICT_VAR = NULL;
static inline int _TYPVAL_ENCODE_CHECK_SELF_REFERENCE( static inline int _TYPVAL_ENCODE_CHECK_SELF_REFERENCE(
@ -367,7 +373,7 @@ static int _TYPVAL_ENCODE_CONVERT_ONE_VALUE(
case VAR_DICT: { case VAR_DICT: {
if (tv->vval.v_dict == NULL if (tv->vval.v_dict == NULL
|| tv->vval.v_dict->dv_hashtab.ht_used == 0) { || tv->vval.v_dict->dv_hashtab.ht_used == 0) {
TYPVAL_ENCODE_CONV_EMPTY_DICT(tv); TYPVAL_ENCODE_CONV_EMPTY_DICT(tv, tv->vval.v_dict);
break; break;
} }
const dictitem_T *type_di; const dictitem_T *type_di;
@ -490,7 +496,7 @@ static int _TYPVAL_ENCODE_CONVERT_ONE_VALUE(
} }
list_T *const val_list = val_di->di_tv.vval.v_list; list_T *const val_list = val_di->di_tv.vval.v_list;
if (val_list == NULL || val_list->lv_len == 0) { if (val_list == NULL || val_list->lv_len == 0) {
TYPVAL_ENCODE_CONV_EMPTY_DICT(tv); TYPVAL_ENCODE_CONV_EMPTY_DICT(tv, TYPVAL_ENCODE_NODICT_VAR);
break; break;
} }
for (const listitem_T *li = val_list->lv_first; li != NULL; for (const listitem_T *li = val_list->lv_first; li != NULL;
@ -708,20 +714,24 @@ typval_encode_stop_converting_one_item:
continue; continue;
} }
} }
TYPVAL_ENCODE_CONV_DICT_START(NULL, pt->pt_dict, if (dict->dv_hashtab.ht_used == 0) {
dict->dv_hashtab.ht_used); TYPVAL_ENCODE_CONV_EMPTY_DICT(NULL, pt->pt_dict);
_mp_push(mpstack, ((MPConvStackVal) { } else {
.type = kMPConvDict, TYPVAL_ENCODE_CONV_DICT_START(NULL, pt->pt_dict,
.tv = NULL, dict->dv_hashtab.ht_used);
.data = { _mp_push(mpstack, ((MPConvStackVal) {
.d = { .type = kMPConvDict,
.dict = dict, .tv = NULL,
.dictp = &pt->pt_dict, .data = {
.hi = dict->dv_hashtab.ht_array, .d = {
.todo = dict->dv_hashtab.ht_used, .dict = dict,
.dictp = &pt->pt_dict,
.hi = dict->dv_hashtab.ht_array,
.todo = dict->dv_hashtab.ht_used,
},
}, },
}, }));
})); }
} else { } else {
TYPVAL_ENCODE_CONV_FUNC_BEFORE_SELF(tv, -1); TYPVAL_ENCODE_CONV_FUNC_BEFORE_SELF(tv, -1);
} }