mirror of
https://github.com/neovim/neovim.git
synced 2025-09-27 13:38:34 +00:00
refactor(eval): use arena when converting typvals to Object
Note: this contains two _temporary_ changes which can be reverted once the Arena vs no-Arena distinction in API wrappers has been removed. Both nlua_push_Object and object_to_vim_take_luaref() has been changed to take the object argument as a pointer. This is not going to be necessary once these are only used with arena (or not at all) allocated Objects. The object_to_vim() variant which leaves luaref untouched might need to stay for a little longer.
This commit is contained in:
@@ -845,15 +845,17 @@ exit_0:
|
||||
write_shifted_output(' %s ret = %s(%s);\n', fn.return_type, fn.name, cparams)
|
||||
|
||||
local ret_type = real_type(fn.return_type)
|
||||
local ret_mode = (ret_type == 'Object') and '&' or ''
|
||||
if fn.has_lua_imp then
|
||||
-- only push onto the Lua stack if we haven't already
|
||||
write_shifted_output(string.format(
|
||||
[[
|
||||
if (lua_gettop(lstate) == 0) {
|
||||
nlua_push_%s(lstate, ret, true);
|
||||
nlua_push_%s(lstate, %sret, true);
|
||||
}
|
||||
]],
|
||||
return_type
|
||||
return_type,
|
||||
ret_mode
|
||||
))
|
||||
elseif string.match(ret_type, '^KeyDict_') then
|
||||
write_shifted_output(
|
||||
@@ -862,7 +864,12 @@ exit_0:
|
||||
)
|
||||
else
|
||||
local special = (fn.since ~= nil and fn.since < 11)
|
||||
write_shifted_output(' nlua_push_%s(lstate, ret, %s);\n', return_type, tostring(special))
|
||||
write_shifted_output(
|
||||
' nlua_push_%s(lstate, %sret, %s);\n',
|
||||
return_type,
|
||||
ret_mode,
|
||||
tostring(special)
|
||||
)
|
||||
end
|
||||
|
||||
-- NOTE: we currently assume err_throw needs nothing from arena
|
||||
|
Reference in New Issue
Block a user