diff options
Diffstat (limited to 'src/lua/modules/thread/je_lua_thread.cpp')
| -rw-r--r-- | src/lua/modules/thread/je_lua_thread.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/lua/modules/thread/je_lua_thread.cpp b/src/lua/modules/thread/je_lua_thread.cpp index a31a037..9d5713e 100644 --- a/src/lua/modules/thread/je_lua_thread.cpp +++ b/src/lua/modules/thread/je_lua_thread.cpp @@ -1,4 +1,4 @@ -#include "common/je_lua_proxy.h" +#include "common/je_lua_object.h" #include "libjin/jin.h" #include "lua/jin.h" @@ -18,8 +18,8 @@ namespace JinEngine static inline SharedThread checkThread(lua_State* L) { - Proxy* proxy = (Proxy*)luax_checktype(L, 1, Jin_Lua_Thread); - return proxy->getShared<Thread>(); + LuaObject* luaObj = (LuaObject*)luax_checktype(L, 1, Jin_Lua_Thread); + return luaObj->getShared<Thread>(); } LUA_IMPLEMENT int threadRunner(void* t) @@ -29,7 +29,7 @@ namespace JinEngine luax_openlibs(L); open(L); luax_getglobal(L, MODULE_NAME); - Proxy* proxy = luax_newinstance(L, Jin_Lua_Thread, &shared); + LuaObject* luaObj = luax_newinstance(L, Jin_Lua_Thread, &shared); luax_setfield(L, -2, "_curThread"); luax_dostring(L, shared->code.c_str()); luax_close(L); @@ -38,8 +38,8 @@ namespace JinEngine LUA_IMPLEMENT int l_thread_gc(lua_State* L) { - Proxy* proxy = (Proxy*)luax_checktype(L, 1, Jin_Lua_Thread); - proxy->release(); + LuaObject* luaObj = (LuaObject*)luax_checktype(L, 1, Jin_Lua_Thread); + luaObj->release(); return 0; } @@ -124,8 +124,8 @@ namespace JinEngine break; case Thread::Variant::POINTER: - Proxy* p = (Proxy*)v.pointer; - Proxy* proxy = luax_newinstance(L, p->getObjectType(), p->getSharedBase()); + LuaObject* p = (LuaObject*)v.pointer; + LuaObject* luaObj = luax_newinstance(L, p->getObjectType(), p->getSharedBase()); break; } @@ -156,9 +156,9 @@ namespace JinEngine break; case Thread::Variant::POINTER: - Proxy* p = (Proxy*)v.pointer; + LuaObject* p = (LuaObject*)v.pointer; const char* objType = p->getObjectType(); - Proxy* proxy = luax_newinstance(L, objType, p->getSharedBase()); + LuaObject* luaObj = luax_newinstance(L, objType, p->getSharedBase()); break; } @@ -215,7 +215,7 @@ namespace JinEngine const char* name = luax_checkstring(L, 1); const char* code = luax_checkstring(L, 2); Thread* thread = new Thread(name, code, threadRunner); - Proxy* proxy = luax_newinstance(L, Jin_Lua_Thread, new Shared<Thread>(L, thread, Jin_Lua_Thread)); + LuaObject* luaObj = luax_newinstance(L, Jin_Lua_Thread, new Shared<Thread>(L, thread, Jin_Lua_Thread)); return 1; } |