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

eval/decode: Rewrite json_decode_string end as suggested by oni-link

Browse Source
This commit is contained in:
ZyX
2016-03-07 09:11:09 +03:00
parent 9c543f2e24
commit 9a56fcb2e8
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -740,21 +740,17 @@ json_decode_string_after_cycle:
} }
} }
} }
if (kv_size(stack) > 1 || kv_size(container_stack)) { if (kv_size(stack) == 1 && kv_size(container_stack) == 0) {
emsgf(_("E474: Unexpected end of input: %.*s"), (int) buf_len, buf); *rettv = kv_pop(stack).val;
goto json_decode_string_fail; goto json_decode_string_ret;
} }
goto json_decode_string_ret; emsgf(_("E474: Unexpected end of input: %.*s"), (int) buf_len, buf);
json_decode_string_fail: json_decode_string_fail:
ret = FAIL; ret = FAIL;
while (kv_size(stack)) { while (kv_size(stack)) {
clear_tv(&(kv_pop(stack).val)); clear_tv(&(kv_pop(stack).val));
} }
json_decode_string_ret: json_decode_string_ret:
if (ret != FAIL) {
assert(kv_size(stack) == 1);
*rettv = kv_pop(stack).val;
}
kv_destroy(stack); kv_destroy(stack);
kv_destroy(container_stack); kv_destroy(container_stack);
return ret; return ret;