diff options
Diffstat (limited to 'src/nvim/msgpack_rpc/helpers.c')
| -rw-r--r-- | src/nvim/msgpack_rpc/helpers.c | 414 |
1 files changed, 195 insertions, 219 deletions
diff --git a/src/nvim/msgpack_rpc/helpers.c b/src/nvim/msgpack_rpc/helpers.c index a4a36e5ebf..b1b9c77953 100644 --- a/src/nvim/msgpack_rpc/helpers.c +++ b/src/nvim/msgpack_rpc/helpers.c @@ -1,19 +1,18 @@ // This is an open source non-commercial project. Dear PVS-Studio, please check // it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com -#include <stdbool.h> #include <inttypes.h> - #include <msgpack.h> +#include <stdbool.h> #include "nvim/api/private/dispatch.h" #include "nvim/api/private/helpers.h" -#include "nvim/msgpack_rpc/helpers.h" +#include "nvim/assert.h" #include "nvim/lib/kvec.h" -#include "nvim/vim.h" #include "nvim/log.h" #include "nvim/memory.h" -#include "nvim/assert.h" +#include "nvim/msgpack_rpc/helpers.h" +#include "nvim/vim.h" #ifdef INCLUDE_GENERATED_DECLARATIONS # include "msgpack_rpc/helpers.c.generated.h" @@ -86,8 +85,9 @@ bool msgpack_rpc_to_object(const msgpack_object *const obj, Object *const arg) FUNC_ATTR_NONNULL_ALL { bool ret = true; - kvec_t(MPToAPIObjectStackItem) stack = KV_INITIAL_VALUE; - kv_push(stack, ((MPToAPIObjectStackItem) { + kvec_withinit_t(MPToAPIObjectStackItem, 2) stack = KV_INITIAL_VALUE; + kvi_init(stack); + kvi_push(stack, ((MPToAPIObjectStackItem) { .mobj = obj, .aobj = arg, .container = false, @@ -99,178 +99,167 @@ bool msgpack_rpc_to_object(const msgpack_object *const obj, Object *const arg) *cur.aobj = NIL; } switch (cur.mobj->type) { - case MSGPACK_OBJECT_NIL: { - break; - } - case MSGPACK_OBJECT_BOOLEAN: { - *cur.aobj = BOOLEAN_OBJ(cur.mobj->via.boolean); - break; - } - case MSGPACK_OBJECT_NEGATIVE_INTEGER: { - STATIC_ASSERT(sizeof(Integer) == sizeof(cur.mobj->via.i64), - "Msgpack integer size does not match API integer"); - *cur.aobj = INTEGER_OBJ(cur.mobj->via.i64); - break; - } - case MSGPACK_OBJECT_POSITIVE_INTEGER: { - STATIC_ASSERT(sizeof(Integer) == sizeof(cur.mobj->via.u64), - "Msgpack integer size does not match API integer"); - if (cur.mobj->via.u64 > API_INTEGER_MAX) { - ret = false; - } else { - *cur.aobj = INTEGER_OBJ((Integer)cur.mobj->via.u64); - } - break; + case MSGPACK_OBJECT_NIL: + break; + case MSGPACK_OBJECT_BOOLEAN: + *cur.aobj = BOOLEAN_OBJ(cur.mobj->via.boolean); + break; + case MSGPACK_OBJECT_NEGATIVE_INTEGER: + STATIC_ASSERT(sizeof(Integer) == sizeof(cur.mobj->via.i64), + "Msgpack integer size does not match API integer"); + *cur.aobj = INTEGER_OBJ(cur.mobj->via.i64); + break; + case MSGPACK_OBJECT_POSITIVE_INTEGER: + STATIC_ASSERT(sizeof(Integer) == sizeof(cur.mobj->via.u64), + "Msgpack integer size does not match API integer"); + if (cur.mobj->via.u64 > API_INTEGER_MAX) { + ret = false; + } else { + *cur.aobj = INTEGER_OBJ((Integer)cur.mobj->via.u64); } + break; #ifdef NVIM_MSGPACK_HAS_FLOAT32 - case MSGPACK_OBJECT_FLOAT32: - case MSGPACK_OBJECT_FLOAT64: + case MSGPACK_OBJECT_FLOAT32: + case MSGPACK_OBJECT_FLOAT64: #else - case MSGPACK_OBJECT_FLOAT: + case MSGPACK_OBJECT_FLOAT: #endif - { - STATIC_ASSERT(sizeof(Float) == sizeof(cur.mobj->via.f64), - "Msgpack floating-point size does not match API integer"); - *cur.aobj = FLOAT_OBJ(cur.mobj->via.f64); - break; - } + { + STATIC_ASSERT(sizeof(Float) == sizeof(cur.mobj->via.f64), + "Msgpack floating-point size does not match API integer"); + *cur.aobj = FLOAT_OBJ(cur.mobj->via.f64); + break; + } #define STR_CASE(type, attr, obj, dest, conv) \ - case type: { \ - dest = conv(((String) { \ - .size = obj->via.attr.size, \ - .data = (obj->via.attr.ptr == NULL || obj->via.attr.size == 0 \ +case type: { \ + dest = conv(((String) { \ + .size = obj->via.attr.size, \ + .data = (obj->via.attr.ptr == NULL || obj->via.attr.size == 0 \ ? xmemdupz("", 0) \ : xmemdupz(obj->via.attr.ptr, obj->via.attr.size)), \ - })); \ - break; \ - } + })); \ + break; \ +} STR_CASE(MSGPACK_OBJECT_STR, str, cur.mobj, *cur.aobj, STRING_OBJ) STR_CASE(MSGPACK_OBJECT_BIN, bin, cur.mobj, *cur.aobj, STRING_OBJ) - case MSGPACK_OBJECT_ARRAY: { - const size_t size = cur.mobj->via.array.size; - if (cur.container) { - if (cur.idx >= size) { - (void)kv_pop(stack); - } else { - const size_t idx = cur.idx; - cur.idx++; - kv_last(stack) = cur; - kv_push(stack, ((MPToAPIObjectStackItem) { + case MSGPACK_OBJECT_ARRAY: { + const size_t size = cur.mobj->via.array.size; + if (cur.container) { + if (cur.idx >= size) { + (void)kv_pop(stack); + } else { + const size_t idx = cur.idx; + cur.idx++; + kv_last(stack) = cur; + kvi_push(stack, ((MPToAPIObjectStackItem) { .mobj = &cur.mobj->via.array.ptr[idx], .aobj = &cur.aobj->data.array.items[idx], .container = false, })); - } - } else { - *cur.aobj = ARRAY_OBJ(((Array) { + } + } else { + *cur.aobj = ARRAY_OBJ(((Array) { .size = size, .capacity = size, .items = (size > 0 ? xcalloc(size, sizeof(*cur.aobj->data.array.items)) : NULL), })); - cur.container = true; - kv_last(stack) = cur; - } - break; + cur.container = true; + kv_last(stack) = cur; } - case MSGPACK_OBJECT_MAP: { - const size_t size = cur.mobj->via.map.size; - if (cur.container) { - if (cur.idx >= size) { - (void)kv_pop(stack); - } else { - const size_t idx = cur.idx; - cur.idx++; - kv_last(stack) = cur; - const msgpack_object *const key = &cur.mobj->via.map.ptr[idx].key; - switch (key->type) { + break; + } + case MSGPACK_OBJECT_MAP: { + const size_t size = cur.mobj->via.map.size; + if (cur.container) { + if (cur.idx >= size) { + (void)kv_pop(stack); + } else { + const size_t idx = cur.idx; + cur.idx++; + kv_last(stack) = cur; + const msgpack_object *const key = &cur.mobj->via.map.ptr[idx].key; + switch (key->type) { #define ID(x) x - STR_CASE(MSGPACK_OBJECT_STR, str, key, - cur.aobj->data.dictionary.items[idx].key, ID) - STR_CASE(MSGPACK_OBJECT_BIN, bin, key, - cur.aobj->data.dictionary.items[idx].key, ID) + STR_CASE(MSGPACK_OBJECT_STR, str, key, + cur.aobj->data.dictionary.items[idx].key, ID) + STR_CASE(MSGPACK_OBJECT_BIN, bin, key, + cur.aobj->data.dictionary.items[idx].key, ID) #undef ID - case MSGPACK_OBJECT_NIL: - case MSGPACK_OBJECT_BOOLEAN: - case MSGPACK_OBJECT_POSITIVE_INTEGER: - case MSGPACK_OBJECT_NEGATIVE_INTEGER: + case MSGPACK_OBJECT_NIL: + case MSGPACK_OBJECT_BOOLEAN: + case MSGPACK_OBJECT_POSITIVE_INTEGER: + case MSGPACK_OBJECT_NEGATIVE_INTEGER: #ifdef NVIM_MSGPACK_HAS_FLOAT32 - case MSGPACK_OBJECT_FLOAT32: - case MSGPACK_OBJECT_FLOAT64: + case MSGPACK_OBJECT_FLOAT32: + case MSGPACK_OBJECT_FLOAT64: #else - case MSGPACK_OBJECT_FLOAT: + case MSGPACK_OBJECT_FLOAT: #endif - case MSGPACK_OBJECT_EXT: - case MSGPACK_OBJECT_MAP: - case MSGPACK_OBJECT_ARRAY: { - ret = false; - break; - } - } - if (ret) { - kv_push(stack, ((MPToAPIObjectStackItem) { + case MSGPACK_OBJECT_EXT: + case MSGPACK_OBJECT_MAP: + case MSGPACK_OBJECT_ARRAY: + ret = false; + break; + } + if (ret) { + kvi_push(stack, ((MPToAPIObjectStackItem) { .mobj = &cur.mobj->via.map.ptr[idx].val, .aobj = &cur.aobj->data.dictionary.items[idx].value, .container = false, })); - } } - } else { - *cur.aobj = DICTIONARY_OBJ(((Dictionary) { + } + } else { + *cur.aobj = DICTIONARY_OBJ(((Dictionary) { .size = size, .capacity = size, .items = (size > 0 ? xcalloc(size, sizeof(*cur.aobj->data.dictionary.items)) : NULL), })); - cur.container = true; - kv_last(stack) = cur; - } - break; + cur.container = true; + kv_last(stack) = cur; } - case MSGPACK_OBJECT_EXT: { - switch ((ObjectType)(cur.mobj->via.ext.type + EXT_OBJECT_TYPE_SHIFT)) { - case kObjectTypeBuffer: { - cur.aobj->type = kObjectTypeBuffer; - ret = msgpack_rpc_to_buffer(cur.mobj, &cur.aobj->data.integer); - break; - } - case kObjectTypeWindow: { - cur.aobj->type = kObjectTypeWindow; - ret = msgpack_rpc_to_window(cur.mobj, &cur.aobj->data.integer); - break; - } - case kObjectTypeTabpage: { - cur.aobj->type = kObjectTypeTabpage; - ret = msgpack_rpc_to_tabpage(cur.mobj, &cur.aobj->data.integer); - break; - } - case kObjectTypeNil: - case kObjectTypeBoolean: - case kObjectTypeInteger: - case kObjectTypeFloat: - case kObjectTypeString: - case kObjectTypeArray: - case kObjectTypeDictionary: - case kObjectTypeLuaRef: { - break; - } - } + break; + } + case MSGPACK_OBJECT_EXT: + switch ((ObjectType)(cur.mobj->via.ext.type + EXT_OBJECT_TYPE_SHIFT)) { + case kObjectTypeBuffer: + cur.aobj->type = kObjectTypeBuffer; + ret = msgpack_rpc_to_buffer(cur.mobj, &cur.aobj->data.integer); + break; + case kObjectTypeWindow: + cur.aobj->type = kObjectTypeWindow; + ret = msgpack_rpc_to_window(cur.mobj, &cur.aobj->data.integer); + break; + case kObjectTypeTabpage: + cur.aobj->type = kObjectTypeTabpage; + ret = msgpack_rpc_to_tabpage(cur.mobj, &cur.aobj->data.integer); + break; + case kObjectTypeNil: + case kObjectTypeBoolean: + case kObjectTypeInteger: + case kObjectTypeFloat: + case kObjectTypeString: + case kObjectTypeArray: + case kObjectTypeDictionary: + case kObjectTypeLuaRef: break; } + break; #undef STR_CASE } if (!cur.container) { (void)kv_pop(stack); } } - kv_destroy(stack); + kvi_destroy(stack); return ret; } -static bool msgpack_rpc_to_string(const msgpack_object *const obj, - String *const arg) +static bool msgpack_rpc_to_string(const msgpack_object *const obj, String *const arg) FUNC_ATTR_NONNULL_ALL { if (obj->type == MSGPACK_OBJECT_BIN || obj->type == MSGPACK_OBJECT_STR) { @@ -302,8 +291,7 @@ bool msgpack_rpc_to_array(const msgpack_object *const obj, Array *const arg) return true; } -bool msgpack_rpc_to_dictionary(const msgpack_object *const obj, - Dictionary *const arg) +bool msgpack_rpc_to_dictionary(const msgpack_object *const obj, Dictionary *const arg) FUNC_ATTR_NONNULL_ALL { if (obj->type != MSGPACK_OBJECT_MAP) { @@ -316,12 +304,12 @@ bool msgpack_rpc_to_dictionary(const msgpack_object *const obj, for (uint32_t i = 0; i < obj->via.map.size; i++) { if (!msgpack_rpc_to_string(&obj->via.map.ptr[i].key, - &arg->items[i].key)) { + &arg->items[i].key)) { return false; } if (!msgpack_rpc_to_object(&obj->via.map.ptr[i].val, - &arg->items[i].value)) { + &arg->items[i].value)) { return false; } } @@ -375,100 +363,93 @@ typedef struct { void msgpack_rpc_from_object(const Object result, msgpack_packer *const res) FUNC_ATTR_NONNULL_ARG(2) { - kvec_t(APIToMPObjectStackItem) stack = KV_INITIAL_VALUE; - kv_push(stack, ((APIToMPObjectStackItem) { &result, false, 0 })); + kvec_withinit_t(APIToMPObjectStackItem, 2) stack = KV_INITIAL_VALUE; + kvi_init(stack); + kvi_push(stack, ((APIToMPObjectStackItem) { &result, false, 0 })); while (kv_size(stack)) { APIToMPObjectStackItem cur = kv_last(stack); STATIC_ASSERT(kObjectTypeWindow == kObjectTypeBuffer + 1 && kObjectTypeTabpage == kObjectTypeWindow + 1, "Buffer, window and tabpage enum items are in order"); switch (cur.aobj->type) { - case kObjectTypeNil: - case kObjectTypeLuaRef: { - // TODO(bfredl): could also be an error. Though kObjectTypeLuaRef - // should only appear when the caller has opted in to handle references, - // see nlua_pop_Object. - msgpack_pack_nil(res); - break; - } - case kObjectTypeBoolean: { - msgpack_rpc_from_boolean(cur.aobj->data.boolean, res); - break; - } - case kObjectTypeInteger: { - msgpack_rpc_from_integer(cur.aobj->data.integer, res); - break; - } - case kObjectTypeFloat: { - msgpack_rpc_from_float(cur.aobj->data.floating, res); - break; - } - case kObjectTypeString: { - msgpack_rpc_from_string(cur.aobj->data.string, res); - break; - } - case kObjectTypeBuffer: { - msgpack_rpc_from_buffer(cur.aobj->data.integer, res); - break; - } - case kObjectTypeWindow: { - msgpack_rpc_from_window(cur.aobj->data.integer, res); - break; - } - case kObjectTypeTabpage: { - msgpack_rpc_from_tabpage(cur.aobj->data.integer, res); - break; - } - case kObjectTypeArray: { - const size_t size = cur.aobj->data.array.size; - if (cur.container) { - if (cur.idx >= size) { - (void)kv_pop(stack); - } else { - const size_t idx = cur.idx; - cur.idx++; - kv_last(stack) = cur; - kv_push(stack, ((APIToMPObjectStackItem) { + case kObjectTypeNil: + case kObjectTypeLuaRef: + // TODO(bfredl): could also be an error. Though kObjectTypeLuaRef + // should only appear when the caller has opted in to handle references, + // see nlua_pop_Object. + msgpack_pack_nil(res); + break; + case kObjectTypeBoolean: + msgpack_rpc_from_boolean(cur.aobj->data.boolean, res); + break; + case kObjectTypeInteger: + msgpack_rpc_from_integer(cur.aobj->data.integer, res); + break; + case kObjectTypeFloat: + msgpack_rpc_from_float(cur.aobj->data.floating, res); + break; + case kObjectTypeString: + msgpack_rpc_from_string(cur.aobj->data.string, res); + break; + case kObjectTypeBuffer: + msgpack_rpc_from_buffer(cur.aobj->data.integer, res); + break; + case kObjectTypeWindow: + msgpack_rpc_from_window(cur.aobj->data.integer, res); + break; + case kObjectTypeTabpage: + msgpack_rpc_from_tabpage(cur.aobj->data.integer, res); + break; + case kObjectTypeArray: { + const size_t size = cur.aobj->data.array.size; + if (cur.container) { + if (cur.idx >= size) { + (void)kv_pop(stack); + } else { + const size_t idx = cur.idx; + cur.idx++; + kv_last(stack) = cur; + kvi_push(stack, ((APIToMPObjectStackItem) { .aobj = &cur.aobj->data.array.items[idx], .container = false, })); - } - } else { - msgpack_pack_array(res, size); - cur.container = true; - kv_last(stack) = cur; } - break; + } else { + msgpack_pack_array(res, size); + cur.container = true; + kv_last(stack) = cur; } - case kObjectTypeDictionary: { - const size_t size = cur.aobj->data.dictionary.size; - if (cur.container) { - if (cur.idx >= size) { - (void)kv_pop(stack); - } else { - const size_t idx = cur.idx; - cur.idx++; - kv_last(stack) = cur; - msgpack_rpc_from_string(cur.aobj->data.dictionary.items[idx].key, - res); - kv_push(stack, ((APIToMPObjectStackItem) { + break; + } + case kObjectTypeDictionary: { + const size_t size = cur.aobj->data.dictionary.size; + if (cur.container) { + if (cur.idx >= size) { + (void)kv_pop(stack); + } else { + const size_t idx = cur.idx; + cur.idx++; + kv_last(stack) = cur; + msgpack_rpc_from_string(cur.aobj->data.dictionary.items[idx].key, + res); + kvi_push(stack, ((APIToMPObjectStackItem) { .aobj = &cur.aobj->data.dictionary.items[idx].value, .container = false, })); - } - } else { - msgpack_pack_map(res, size); - cur.container = true; - kv_last(stack) = cur; } - break; + } else { + msgpack_pack_map(res, size); + cur.container = true; + kv_last(stack) = cur; } + break; + } } if (!cur.container) { (void)kv_pop(stack); } } - kv_destroy(stack); + kvi_destroy(stack); } void msgpack_rpc_from_array(Array result, msgpack_packer *res) @@ -493,9 +474,7 @@ void msgpack_rpc_from_dictionary(Dictionary result, msgpack_packer *res) } /// Serializes a msgpack-rpc request or notification(id == 0) -void msgpack_rpc_serialize_request(uint32_t request_id, - const String method, - Array args, +void msgpack_rpc_serialize_request(uint32_t request_id, const String method, Array args, msgpack_packer *pac) FUNC_ATTR_NONNULL_ARG(4) { @@ -511,9 +490,7 @@ void msgpack_rpc_serialize_request(uint32_t request_id, } /// Serializes a msgpack-rpc response -void msgpack_rpc_serialize_response(uint32_t response_id, - Error *err, - Object arg, +void msgpack_rpc_serialize_response(uint32_t response_id, Error *err, Object arg, msgpack_packer *pac) FUNC_ATTR_NONNULL_ARG(2, 4) { @@ -544,15 +521,15 @@ static bool msgpack_rpc_is_notification(msgpack_object *req) msgpack_object *msgpack_rpc_method(msgpack_object *req) { msgpack_object *obj = req->via.array.ptr - + (msgpack_rpc_is_notification(req) ? 1 : 2); + + (msgpack_rpc_is_notification(req) ? 1 : 2); return obj->type == MSGPACK_OBJECT_STR || obj->type == MSGPACK_OBJECT_BIN ? - obj : NULL; + obj : NULL; } msgpack_object *msgpack_rpc_args(msgpack_object *req) { msgpack_object *obj = req->via.array.ptr - + (msgpack_rpc_is_notification(req) ? 2 : 3); + + (msgpack_rpc_is_notification(req) ? 2 : 3); return obj->type == MSGPACK_OBJECT_ARRAY ? obj : NULL; } @@ -565,8 +542,7 @@ static msgpack_object *msgpack_rpc_msg_id(msgpack_object *req) return obj->type == MSGPACK_OBJECT_POSITIVE_INTEGER ? obj : NULL; } -MessageType msgpack_rpc_validate(uint32_t *response_id, msgpack_object *req, - Error *err) +MessageType msgpack_rpc_validate(uint32_t *response_id, msgpack_object *req, Error *err) { *response_id = 0; // Validate the basic structure of the msgpack-rpc payload |