Skip to content

refactor: optmize luaA_class_setup #4073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cnjhb wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −6
Open

refactor: optmize luaA_class_setup #4073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions common/luaclass.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,10 +229,12 @@ luaA_class_gc(lua_State *L)
* \param newindex_miss_property Function to call when an object of this class
* receive a __newindex request on an unknown property.
* \param methods The methods to set on the class table.
* \param n_methods The number of methods.
* \param meta The meta-methods to set on the class objects.
* \param n_meta The number of meta-methods.
*/
void
luaA_class_setup(lua_State *L, lua_class_t *class,
luaA_class_setupx(lua_State *L, lua_class_t *class,
const char *name,
lua_class_t *parent,
lua_class_allocator_t allocator,
Expand All @@ -241,10 +243,12 @@ luaA_class_setup(lua_State *L, lua_class_t *class,
lua_class_propfunc_t index_miss_property,
lua_class_propfunc_t newindex_miss_property,
const struct luaL_Reg methods[],
const struct luaL_Reg meta[])
int n_methods,
const struct luaL_Reg meta[],
int n_meta)
{
/* Create the object metatable */
lua_newtable(L);
lua_createtable(L, 0, n_meta + 2); /* The +2 is for __gc and __index. */
/* Register it with class pointer as key in the registry
* class-pointer -> metatable */
lua_pushlightuserdata(L, class);
Expand All @@ -266,7 +270,11 @@ luaA_class_setup(lua_State *L, lua_class_t *class,
lua_setfield(L, -2, "__index"); /* metatable.__index = metatable 1 */

luaA_setfuncs(L, meta); /* 1 */
luaA_registerlib(L, name, methods); /* 2 */
lua_createtable(L, 0, n_methods); /* 2 */
luaA_setfuncs(L, methods);
lua_pushvalue(L, -1);
lua_setglobal(L, name);

lua_pushvalue(L, -1); /* dup self as metatable 3 */
lua_setmetatable(L, -2); /* set self as metatable 2 */
lua_pop(L, 2);
Expand Down
7 changes: 5 additions & 2 deletions common/luaclass.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,14 @@ void luaA_class_disconnect_signal_from_stack(lua_State *, lua_class_t *, const c
void luaA_class_emit_signal(lua_State *, lua_class_t *, const char *, int);

void luaA_openlib(lua_State *, const char *, const struct luaL_Reg[], const struct luaL_Reg[]);
void luaA_class_setup(lua_State *, lua_class_t *, const char *, lua_class_t *,
void luaA_class_setupx(lua_State *, lua_class_t *, const char *, lua_class_t *,
lua_class_allocator_t, lua_class_collector_t,
lua_class_checker_t,
lua_class_propfunc_t, lua_class_propfunc_t,
const struct luaL_Reg[], const struct luaL_Reg[]);
const struct luaL_Reg[], int,
const struct luaL_Reg[], int);
#define luaA_class_setup(L, class, name, parent, allocator, collector, checker, index_miss_property, newindex_miss_property, methods, meta) \
luaA_class_setupx(L, class, name, parent, allocator, collector, checker, index_miss_property, newindex_miss_property, methods, countof(methods) - 1, meta, countof(meta) - 1)

void luaA_class_add_property(lua_class_t *, const char *,
lua_class_propfunc_t, lua_class_propfunc_t, lua_class_propfunc_t);
Expand Down
Loading