From 8cd03a53878b9d67eb4b13fb546dbd989d8217e2 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Tue, 4 Dec 2018 10:13:03 +0800
Subject: *proxy->lua object

---
 src/lua/modules/net/je_lua_buffer.cpp | 10 +++++-----
 src/lua/modules/net/je_lua_net.cpp    |  6 +++---
 src/lua/modules/net/je_lua_socket.cpp | 20 ++++++++++----------
 3 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'src/lua/modules/net')

diff --git a/src/lua/modules/net/je_lua_buffer.cpp b/src/lua/modules/net/je_lua_buffer.cpp
index 5442e14..327e7ed 100644
--- a/src/lua/modules/net/je_lua_buffer.cpp
+++ b/src/lua/modules/net/je_lua_buffer.cpp
@@ -1,4 +1,4 @@
-#include "common/je_lua_proxy.h"
+#include "common/je_lua_object.h"
 #include "common/je_lua_common.h"
 #include "libjin/jin.h"
 #include "je_lua_buffer.h"
@@ -14,8 +14,8 @@ namespace JinEngine
 
         static inline SharedBuffer checkNetBuffer(lua_State* L)
         {
-            Proxy* proxy = (Proxy*)luax_checktype(L, 1, Jin_Lua_Buffer);
-		    return proxy->getShared<Net::Buffer>();
+            LuaObject* luaObj = (LuaObject*)luax_checktype(L, 1, Jin_Lua_Buffer);
+		    return luaObj->getShared<Net::Buffer>();
         }
 
         // net.Buffer:append(value) -> value_length
@@ -112,8 +112,8 @@ namespace JinEngine
 
         LUA_IMPLEMENT int l_gc(lua_State* L)
         {
-            Proxy* proxy = (Proxy*)luax_checktype(L, 1, Jin_Lua_Buffer);
-            proxy->release();
+            LuaObject* luaObj = (LuaObject*)luax_checktype(L, 1, Jin_Lua_Buffer);
+            luaObj->release();
             return 0;
         }
 
diff --git a/src/lua/modules/net/je_lua_net.cpp b/src/lua/modules/net/je_lua_net.cpp
index 058b4e8..bbafa3f 100644
--- a/src/lua/modules/net/je_lua_net.cpp
+++ b/src/lua/modules/net/je_lua_net.cpp
@@ -1,4 +1,4 @@
-#include "common/je_lua_proxy.h"
+#include "common/je_lua_object.h"
 #include "libjin/jin.h"
 #include "common/je_lua_common.h"
 
@@ -49,7 +49,7 @@ namespace Lua
             }
         }
         Socket* socket = new Socket(info);
-        Proxy* proxy = luax_newinstance(L, Jin_Lua_Socket, new Shared<Socket>(L, socket, Jin_Lua_Socket));
+        LuaObject* luaObj = luax_newinstance(L, Jin_Lua_Socket, new Shared<Socket>(L, socket, Jin_Lua_Socket));
         return 1;
     }
 
@@ -57,7 +57,7 @@ namespace Lua
     {
         int size = luax_checkinteger(L, 1);
         Net::Buffer* buffer = new Net::Buffer(size);
-        Proxy* proxy = luax_newinstance(L, Jin_Lua_Buffer, new Shared<Buffer>(L, buffer, Jin_Lua_Buffer));
+        LuaObject* luaObj = luax_newinstance(L, Jin_Lua_Buffer, new Shared<Buffer>(L, buffer, Jin_Lua_Buffer));
         return 1;
     }
 
diff --git a/src/lua/modules/net/je_lua_socket.cpp b/src/lua/modules/net/je_lua_socket.cpp
index 899c70a..e6c2d79 100644
--- a/src/lua/modules/net/je_lua_socket.cpp
+++ b/src/lua/modules/net/je_lua_socket.cpp
@@ -1,4 +1,4 @@
-#include "common/je_lua_proxy.h"
+#include "common/je_lua_object.h"
 #include "common/je_lua_common.h"
 #include "libjin/jin.h"
 #include "je_lua_buffer.h"
@@ -19,14 +19,14 @@ namespace JinEngine
 
         LUA_IMPLEMENT inline SharedSocket checkSocket(lua_State* L, int pos = 1)
         {
-            Proxy* proxy = (Proxy*)luax_checktype(L, pos, Jin_Lua_Socket);
-		    return proxy->getShared<Socket>();
+            LuaObject* luaObj = (LuaObject*)luax_checktype(L, pos, Jin_Lua_Socket);
+		    return luaObj->getShared<Socket>();
         }
 
         LUA_IMPLEMENT inline Shared<Buffer>& checkNetBuffer(lua_State* L, int pos = 1)
         {
-            Proxy* proxy = (Proxy*)luax_checktype(L, pos, Jin_Lua_Buffer);
-		    return proxy->getShared<Buffer>();
+            LuaObject* luaObj = (LuaObject*)luax_checktype(L, pos, Jin_Lua_Buffer);
+		    return luaObj->getShared<Buffer>();
         }
 
         // return net.Socket
@@ -34,7 +34,7 @@ namespace JinEngine
         {
 		    SharedSocket socket = checkSocket(L);
             Socket* client = socket->accept();
-            Proxy* proxy = luax_newinstance(L, Jin_Lua_Socket, new Shared<Socket>(L, client, Jin_Lua_Socket));
+            LuaObject* luaObj = luax_newinstance(L, Jin_Lua_Socket, new Shared<Socket>(L, client, Jin_Lua_Socket));
             return 1;
         }
     
@@ -45,7 +45,7 @@ namespace JinEngine
             char buffer[BUFFER_SIZE] = {0};
             int size = socket->receive(buffer, BUFFER_SIZE);
             Net::Buffer* netBuffer = new Net::Buffer(buffer, size);
-            Proxy* proxy = luax_newinstance(L, Jin_Lua_Buffer, new Shared<Buffer>(L, netBuffer, Jin_Lua_Buffer));
+            LuaObject* luaObj = luax_newinstance(L, Jin_Lua_Buffer, new Shared<Buffer>(L, netBuffer, Jin_Lua_Buffer));
             return 1;
         }
     
@@ -58,7 +58,7 @@ namespace JinEngine
             char buffer[BUFFER_SIZE];
             int size = socket->receiveFrom(buffer, BUFFER_SIZE, address, port);
             Net::Buffer* netBuffer = new Net::Buffer(buffer, size);
-            Proxy* proxy = luax_newinstance(L, Jin_Lua_Buffer, new Shared<Buffer>(L, netBuffer, Jin_Lua_Buffer));
+            LuaObject* luaObj = luax_newinstance(L, Jin_Lua_Buffer, new Shared<Buffer>(L, netBuffer, Jin_Lua_Buffer));
             return 1;
         }
 
@@ -100,8 +100,8 @@ namespace JinEngine
 
         LUA_IMPLEMENT int l_gc(lua_State* L)
         {
-            Proxy* proxy = (Proxy*)luax_checktype(L, 1, Jin_Lua_Socket);
-            proxy->release();
+            LuaObject* luaObj = (LuaObject*)luax_checktype(L, 1, Jin_Lua_Socket);
+            luaObj->release();
             return 0;
         }
 
-- 
cgit v1.1-26-g67d0