diff options
Diffstat (limited to 'src/nvim/generators')
| -rw-r--r-- | src/nvim/generators/c_grammar.lua | 1 | ||||
| -rw-r--r-- | src/nvim/generators/gen_api_dispatch.lua | 13 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/nvim/generators/c_grammar.lua b/src/nvim/generators/c_grammar.lua index 1720b32919..8a3e70990a 100644 --- a/src/nvim/generators/c_grammar.lua +++ b/src/nvim/generators/c_grammar.lua @@ -47,6 +47,7 @@ local c_proto = Ct( * (fill * Cg((P('FUNC_API_SINCE(') * C(num ^ 1)) * P(')'), 'since') ^ -1) * (fill * Cg((P('FUNC_API_DEPRECATED_SINCE(') * C(num ^ 1)) * P(')'), 'deprecated_since') ^ -1) * (fill * Cg((P('FUNC_API_FAST') * Cc(true)), 'fast') ^ -1) + * (fill * Cg((P('FUNC_API_RET_ALLOC') * Cc(true)), 'ret_alloc') ^ -1) * (fill * Cg((P('FUNC_API_NOEXPORT') * Cc(true)), 'noexport') ^ -1) * (fill * Cg((P('FUNC_API_REMOTE_ONLY') * Cc(true)), 'remote_only') ^ -1) * (fill * Cg((P('FUNC_API_LUA_ONLY') * Cc(true)), 'lua_only') ^ -1) diff --git a/src/nvim/generators/gen_api_dispatch.lua b/src/nvim/generators/gen_api_dispatch.lua index 90ed90d2bc..c3fc5aa0a3 100644 --- a/src/nvim/generators/gen_api_dispatch.lua +++ b/src/nvim/generators/gen_api_dispatch.lua @@ -60,8 +60,7 @@ local function add_function(fn) fn.parameters[#fn.parameters] = nil end if #fn.parameters ~= 0 and fn.parameters[#fn.parameters][1] == 'arena' then - -- return value is allocated in an arena - fn.arena_return = true + fn.receives_arena = true fn.parameters[#fn.parameters] = nil end end @@ -554,7 +553,7 @@ for i = 1, #functions do table.insert(call_args, a) end - if fn.arena_return then + if fn.receives_arena then table.insert(call_args, 'arena') end @@ -621,8 +620,8 @@ for n, name in ipairs(hashorder) do .. (fn.impl_name or fn.name) .. ', .fast = ' .. tostring(fn.fast) - .. ', .arena_return = ' - .. tostring(not not fn.arena_return) + .. ', .ret_alloc = ' + .. tostring(not not fn.ret_alloc) .. '},\n' ) end @@ -791,7 +790,7 @@ local function process_function(fn) if fn.receives_channel_id then cparams = 'LUA_INTERNAL_CALL, ' .. cparams end - if fn.arena_return then + if fn.receives_arena then cparams = cparams .. '&arena, ' end @@ -839,7 +838,7 @@ exit_0: return_type = fn.return_type end local free_retval = '' - if not fn.arena_return then + if fn.ret_alloc then free_retval = ' api_free_' .. return_type:lower() .. '(ret);' end write_shifted_output(' %s ret = %s(%s);\n', fn.return_type, fn.name, cparams) |