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

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

@@ -193,7 +193,7 @@ 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;
@@ -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 {

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

@@ -336,10 +336,7 @@ 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, \
*mpstack, \
((MPConvStackVal) { \
.type = kMPConvList, \ .type = kMPConvList, \
.data = { \ .data = { \
.l = { \ .l = { \