mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-25 12:38:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

eval/*: Fix some linter errors

Browse Source
This commit is contained in:
ZyX
2016-02-03 21:56:01 +03:00
parent 57700def79
commit 634e51d12b
2 changed files with 42 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/eval/decode.c
View File

@@ -193,8 +193,8 @@ int json_decode_string(const char *const buf, const size_t len,
} else if (didcolon) { } else if (didcolon) {
EMSG2(_("E474: Comma after colon: %s"), p); EMSG2(_("E474: Comma after colon: %s"), p);
goto json_decode_string_fail; goto json_decode_string_fail;
} if (last_container.container.v_type == VAR_DICT } else if (last_container.container.v_type == VAR_DICT
&& last_container.stack_index != kv_size(stack) - 1) { && last_container.stack_index != kv_size(stack) - 1) {
EMSG2(_("E474: Using comma in place of colon: %s"), p); EMSG2(_("E474: Using comma in place of colon: %s"), p);
goto json_decode_string_fail; goto json_decode_string_fail;
} else if ((last_container.container.v_type == VAR_DICT } else if ((last_container.container.v_type == VAR_DICT
@@ -364,8 +364,7 @@ int json_decode_string(const char *const buf, const size_t len,
const int full_char = ( const int full_char = (
(int) (ch - SURROGATE_LO_START) (int) (ch - SURROGATE_LO_START)
+ ((fst_in_pair - SURROGATE_HI_START) << 10) + ((fst_in_pair - SURROGATE_HI_START) << 10)
+ SURROGATE_FIRST_CHAR + SURROGATE_FIRST_CHAR);
);
str_end += utf_char2bytes(full_char, (char_u *) str_end); str_end += utf_char2bytes(full_char, (char_u *) str_end);
fst_in_pair = 0; fst_in_pair = 0;
} else { } else {
@@ -763,7 +762,7 @@ msgpack_to_vim_generic_map: {}
.vval = { .v_list = list }, .vval = { .v_list = list },
})); }));
if (encode_list_write((void *) ext_val_list, mobj.via.ext.ptr, if (encode_list_write((void *) ext_val_list, mobj.via.ext.ptr,
mobj.via.ext.size) == -1) { mobj.via.ext.size) == -1) {
return FAIL; return FAIL;
} }
break; break;

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

@@ -200,7 +200,7 @@ static int conv_error(const char *const msg, const MPConvStack *const mpstack,
/// @return true in case of success, false in case of failure. /// @return true in case of success, false in case of failure.
bool encode_vim_list_to_buf(const list_T *const list, size_t *const ret_len, bool encode_vim_list_to_buf(const list_T *const list, size_t *const ret_len,
char **const ret_buf) char **const ret_buf)
FUNC_ATTR_NONNULL_ARG(2,3) FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_ARG(2, 3) FUNC_ATTR_WARN_UNUSED_RESULT
{ {
size_t len = 0; size_t len = 0;
if (list != NULL) { if (list != NULL) {
@@ -336,18 +336,15 @@ static int name##_convert_one_value(firstargtype firstargname, \
} \ } \
CHECK_SELF_REFERENCE(tv->vval.v_list, lv_copyID, kMPConvList); \ CHECK_SELF_REFERENCE(tv->vval.v_list, lv_copyID, kMPConvList); \
CONV_LIST_START(tv->vval.v_list); \ CONV_LIST_START(tv->vval.v_list); \
kv_push( \ kv_push(MPConvStackVal, *mpstack, ((MPConvStackVal) { \
MPConvStackVal, \ .type = kMPConvList, \
*mpstack, \ .data = { \
((MPConvStackVal) { \ .l = { \
.type = kMPConvList, \ .list = tv->vval.v_list, \
.data = { \ .li = tv->vval.v_list->lv_first, \
.l = { \ }, \
.list = tv->vval.v_list, \ }, \
.li = tv->vval.v_list->lv_first, \ })); \
}, \
}, \
})); \
break; \ break; \
} \ } \
case VAR_SPECIAL: { \ case VAR_SPECIAL: { \
@@ -475,14 +472,14 @@ static int name##_convert_one_value(firstargtype firstargname, \
kMPConvList); \ kMPConvList); \
CONV_LIST_START(val_di->di_tv.vval.v_list); \ CONV_LIST_START(val_di->di_tv.vval.v_list); \
kv_push(MPConvStackVal, *mpstack, ((MPConvStackVal) { \ kv_push(MPConvStackVal, *mpstack, ((MPConvStackVal) { \
.type = kMPConvList, \ .type = kMPConvList, \
.data = { \ .data = { \
.l = { \ .l = { \
.list = val_di->di_tv.vval.v_list, \ .list = val_di->di_tv.vval.v_list, \
.li = val_di->di_tv.vval.v_list->lv_first, \ .li = val_di->di_tv.vval.v_list->lv_first, \
}, \ }, \
}, \ }, \
})); \ })); \
break; \ break; \
} \ } \
case kMPMap: { \ case kMPMap: { \
@@ -504,14 +501,14 @@ static int name##_convert_one_value(firstargtype firstargname, \
CHECK_SELF_REFERENCE(val_list, lv_copyID, kMPConvPairs); \ CHECK_SELF_REFERENCE(val_list, lv_copyID, kMPConvPairs); \
CONV_DICT_START(val_list->lv_len); \ CONV_DICT_START(val_list->lv_len); \
kv_push(MPConvStackVal, *mpstack, ((MPConvStackVal) { \ kv_push(MPConvStackVal, *mpstack, ((MPConvStackVal) { \
.type = kMPConvPairs, \ .type = kMPConvPairs, \
.data = { \ .data = { \
.l = { \ .l = { \
.list = val_list, \ .list = val_list, \
.li = val_list->lv_first, \ .li = val_list->lv_first, \
}, \ }, \
}, \ }, \
})); \ })); \
break; \ break; \
} \ } \
case kMPExt: { \ case kMPExt: { \
@@ -543,15 +540,15 @@ name##_convert_one_value_regular_dict: \
CHECK_SELF_REFERENCE(tv->vval.v_dict, dv_copyID, kMPConvDict); \ CHECK_SELF_REFERENCE(tv->vval.v_dict, dv_copyID, kMPConvDict); \
CONV_DICT_START(tv->vval.v_dict->dv_hashtab.ht_used); \ CONV_DICT_START(tv->vval.v_dict->dv_hashtab.ht_used); \
kv_push(MPConvStackVal, *mpstack, ((MPConvStackVal) { \ kv_push(MPConvStackVal, *mpstack, ((MPConvStackVal) { \
.type = kMPConvDict, \ .type = kMPConvDict, \
.data = { \ .data = { \
.d = { \ .d = { \
.dict = tv->vval.v_dict, \ .dict = tv->vval.v_dict, \
.hi = tv->vval.v_dict->dv_hashtab.ht_array, \ .hi = tv->vval.v_dict->dv_hashtab.ht_array, \
.todo = tv->vval.v_dict->dv_hashtab.ht_used, \ .todo = tv->vval.v_dict->dv_hashtab.ht_used, \
}, \ }, \
}, \ }, \
})); \ })); \
break; \ break; \
} \ } \
case VAR_UNKNOWN: { \ case VAR_UNKNOWN: { \
@@ -971,7 +968,7 @@ static inline int convert_to_json_string(garray_T *const gap,
if (vim_isprintc(ch)) { if (vim_isprintc(ch)) {
ga_concat_len(gap, buf + i, shift); ga_concat_len(gap, buf + i, shift);
} else if (ch < SURROGATE_FIRST_CHAR) { } else if (ch < SURROGATE_FIRST_CHAR) {
ga_concat_len(gap, ((const char []) { ga_concat_len(gap, ((const char[]) {
'\\', 'u', '\\', 'u',
xdigits[(ch >> (4 * 3)) & 0xF], xdigits[(ch >> (4 * 3)) & 0xF],
xdigits[(ch >> (4 * 2)) & 0xF], xdigits[(ch >> (4 * 2)) & 0xF],
@@ -982,7 +979,7 @@ static inline int convert_to_json_string(garray_T *const gap,
uint32_t tmp = (uint32_t) ch - SURROGATE_FIRST_CHAR; uint32_t tmp = (uint32_t) ch - SURROGATE_FIRST_CHAR;
uint16_t hi = SURROGATE_HI_START + ((tmp >> 10) & ((1 << 10) - 1)); uint16_t hi = SURROGATE_HI_START + ((tmp >> 10) & ((1 << 10) - 1));
uint16_t lo = SURROGATE_LO_END + ((tmp >> 0) & ((1 << 10) - 1)); uint16_t lo = SURROGATE_LO_END + ((tmp >> 0) & ((1 << 10) - 1));
ga_concat_len(gap, ((const char []) { ga_concat_len(gap, ((const char[]) {
'\\', 'u', '\\', 'u',
xdigits[(hi >> (4 * 3)) & 0xF], xdigits[(hi >> (4 * 3)) & 0xF],
xdigits[(hi >> (4 * 2)) & 0xF], xdigits[(hi >> (4 * 2)) & 0xF],