aboutsummaryrefslogtreecommitdiff
path: root/src/lua/modules/net
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2018-11-11 20:18:26 +0800
committerchai <chaifix@163.com>2018-11-11 20:18:26 +0800
commit7c2f33bdf37de7acf9b0728a115377081344db1c (patch)
treecd82766dd4d1d84229ae610e69225bb48b3001b9 /src/lua/modules/net
parente92caa97329016d012b46b9d37e1b2c3b613a8f2 (diff)
*格式化
Diffstat (limited to 'src/lua/modules/net')
-rw-r--r--src/lua/modules/net/je_lua_buffer.cpp30
-rw-r--r--src/lua/modules/net/je_lua_net.cpp4
-rw-r--r--src/lua/modules/net/je_lua_socket.cpp28
3 files changed, 31 insertions, 31 deletions
diff --git a/src/lua/modules/net/je_lua_buffer.cpp b/src/lua/modules/net/je_lua_buffer.cpp
index 4c6880a..974c935 100644
--- a/src/lua/modules/net/je_lua_buffer.cpp
+++ b/src/lua/modules/net/je_lua_buffer.cpp
@@ -11,9 +11,9 @@ namespace JinEngine
namespace Net
{
- typedef Shared<Buffer>& BufferRef;
+ typedef Shared<Buffer>& SharedBuffer;
- static inline BufferRef checkNetBuffer(lua_State* L)
+ static inline SharedBuffer checkNetBuffer(lua_State* L)
{
Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_NETWORK_BUFFER);
return proxy->getShared<Buffer>();
@@ -22,13 +22,13 @@ namespace JinEngine
// net.Buffer:append(value) -> value_length
LUA_IMPLEMENT int l_append(lua_State* L)
{
- BufferRef ref = checkNetBuffer(L);
+ SharedBuffer shared = checkNetBuffer(L);
const int vp = 2;
if (luax_isintegerstrict(L, vp))
{
int n = luax_checkinteger(L, vp);
int size = sizeof(n);
- ref->append(&n, size);
+ shared->append(&n, size);
luax_pushinteger(L, size);
return 1;
}
@@ -36,7 +36,7 @@ namespace JinEngine
{
float n = luax_checknumber(L, vp);
int size = sizeof(n);
- ref->append(&n, size);
+ shared->append(&n, size);
luax_pushinteger(L, size);
return 1;
}
@@ -44,7 +44,7 @@ namespace JinEngine
{
bool n = luax_checkbool(L, vp);
int size = sizeof(n);
- ref->append(&n, size);
+ shared->append(&n, size);
luax_pushinteger(L, size);
return 1;
}
@@ -52,7 +52,7 @@ namespace JinEngine
{
const char* str = luax_checkstring(L, vp);
int size = strlen(str) + 1;
- ref->append(str, size);
+ shared->append(str, size);
luax_pushinteger(L, size);
return 1;
}
@@ -66,10 +66,10 @@ namespace JinEngine
// net.Buffer:grabString(offset) -> string, length
LUA_IMPLEMENT int l_grabString(lua_State* L)
{
- BufferRef ref = checkNetBuffer(L);
+ SharedBuffer shared = checkNetBuffer(L);
int offset = luax_checkinteger(L, 2);
unsigned int len;
- char* data = ref->grabString(&len, offset);
+ char* data = shared->grabString(&len, offset);
Array<char> str;
str.bind(data, len);
luax_pushstring(L, &str);
@@ -80,10 +80,10 @@ namespace JinEngine
// net.Buffer:grabInteger(offset) -> integer, length
LUA_IMPLEMENT int l_grabInteger(lua_State* L)
{
- BufferRef ref = checkNetBuffer(L);
+ SharedBuffer shared = checkNetBuffer(L);
int offset = luax_checkinteger(L, 2);
int len;
- int integer = ref->grabInteger(&len, offset);
+ int integer = shared->grabInteger(&len, offset);
luax_pushinteger(L, integer);
luax_pushinteger(L, len);
return 2;
@@ -91,10 +91,10 @@ namespace JinEngine
LUA_IMPLEMENT int l_grabFloat(lua_State* L)
{
- BufferRef ref = checkNetBuffer(L);
+ SharedBuffer shared = checkNetBuffer(L);
int offset = luax_checkinteger(L, 2);
int len;
- float floatv = ref->grabFloat(&len, offset);
+ float floatv = shared->grabFloat(&len, offset);
luax_pushnumber(L, floatv);
luax_pushinteger(L, len);
return 2;
@@ -102,10 +102,10 @@ namespace JinEngine
LUA_IMPLEMENT int l_grabBoolean(lua_State* L)
{
- BufferRef ref = checkNetBuffer(L);
+ SharedBuffer shared = checkNetBuffer(L);
int offset = luax_checkinteger(L, 2);
int len;
- bool boolean = ref->grabBoolean(&len, offset);
+ bool boolean = shared->grabBoolean(&len, offset);
luax_pushboolean(L, boolean);
luax_pushinteger(L, len);
return 2;
diff --git a/src/lua/modules/net/je_lua_net.cpp b/src/lua/modules/net/je_lua_net.cpp
index cd454d5..58ece43 100644
--- a/src/lua/modules/net/je_lua_net.cpp
+++ b/src/lua/modules/net/je_lua_net.cpp
@@ -48,7 +48,7 @@ namespace Lua
}
}
Socket* socket = new Socket(info);
- Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_NETWORK_SOCKET, sizeof(Proxy));
+ Proxy* proxy = luax_newinstance(L, JIN_NETWORK_SOCKET);
proxy->bind(new Shared<Socket>(socket, JIN_NETWORK_SOCKET));
return 1;
}
@@ -56,7 +56,7 @@ namespace Lua
LUA_IMPLEMENT int l_Buffer(lua_State* L)
{
int size = luax_checkinteger(L, 1);
- Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_NETWORK_BUFFER, sizeof(Proxy));
+ Proxy* proxy = luax_newinstance(L, JIN_NETWORK_BUFFER);
Net::Buffer* buffer = new Net::Buffer(size);
proxy->bind(new Shared<Buffer>(buffer, JIN_NETWORK_BUFFER));
return 1;
diff --git a/src/lua/modules/net/je_lua_socket.cpp b/src/lua/modules/net/je_lua_socket.cpp
index 0b59199..4072921 100644
--- a/src/lua/modules/net/je_lua_socket.cpp
+++ b/src/lua/modules/net/je_lua_socket.cpp
@@ -12,11 +12,11 @@ namespace JinEngine
namespace Lua
{
- typedef Shared<Socket>& SocketRef;
+ typedef Shared<Socket>& SharedSocket;
const int BUFFER_SIZE = 1024;
- LUA_IMPLEMENT inline SocketRef checkSocket(lua_State* L, int pos = 1)
+ LUA_IMPLEMENT inline SharedSocket checkSocket(lua_State* L, int pos = 1)
{
Proxy* proxy = (Proxy*)luax_checktype(L, pos, JIN_NETWORK_SOCKET);
return proxy->getShared<Socket>();
@@ -31,9 +31,9 @@ namespace JinEngine
// return net.Socket
LUA_IMPLEMENT int l_accept(lua_State* L)
{
- SocketRef socket = checkSocket(L);
+ SharedSocket socket = checkSocket(L);
Socket* client = socket->accept();
- Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_NETWORK_SOCKET, sizeof(Proxy));
+ Proxy* proxy = luax_newinstance(L, JIN_NETWORK_SOCKET);
proxy->bind(new Shared<Socket>(client, JIN_NETWORK_SOCKET));
return 1;
}
@@ -41,10 +41,10 @@ namespace JinEngine
// return net.Buffer
LUA_IMPLEMENT int l_receive(lua_State* L)
{
- SocketRef socket = checkSocket(L);
+ SharedSocket socket = checkSocket(L);
char buffer[BUFFER_SIZE] = {0};
int size = socket->receive(buffer, BUFFER_SIZE);
- Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_NETWORK_BUFFER, sizeof(Proxy));
+ Proxy* proxy = luax_newinstance(L, JIN_NETWORK_BUFFER);
Net::Buffer* netBuffer = new Net::Buffer(buffer, size);
proxy->bind(new Shared<Buffer>(netBuffer, JIN_NETWORK_BUFFER));
return 1;
@@ -53,13 +53,13 @@ namespace JinEngine
// Socket:receiveFrom(address, port)
LUA_IMPLEMENT int l_receiveFrom(lua_State* L)
{
- SocketRef socket = checkSocket(L);
+ SharedSocket socket = checkSocket(L);
int address = luax_checkinteger(L, 2);
int port = luax_checkinteger(L, 3);
char buffer[BUFFER_SIZE];
int size = socket->receiveFrom(buffer, BUFFER_SIZE, address, port);
Net::Buffer* netBuffer = new Net::Buffer(buffer, size);
- Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_NETWORK_BUFFER, sizeof(Proxy));
+ Proxy* proxy = luax_newinstance(L, JIN_NETWORK_BUFFER);
proxy->bind(new Shared<Buffer>(netBuffer, JIN_NETWORK_BUFFER));
return 1;
}
@@ -67,9 +67,9 @@ namespace JinEngine
// Socket:send(net.Buffer) -> data_length
LUA_IMPLEMENT int l_send(lua_State* L)
{
- SocketRef socket = checkSocket(L);
- Shared<Buffer>& ref = checkNetBuffer(L, 2);
- int len = socket->send(ref->buffer, ref->size);
+ SharedSocket socket = checkSocket(L);
+ Shared<Buffer>& shared = checkNetBuffer(L, 2);
+ int len = socket->send(shared->buffer, shared->size);
luax_pushinteger(L, len);
return 1;
}
@@ -77,7 +77,7 @@ namespace JinEngine
// Socket:sendTo(address, port, net.Buffer)
LUA_IMPLEMENT int l_sendTo(lua_State* L)
{
- SocketRef socket = checkSocket(L);
+ SharedSocket socket = checkSocket(L);
int address = luax_checkinteger(L, 2);
int port = luax_checkinteger(L, 3);
Shared<Buffer>& buffer = checkNetBuffer(L, 4);
@@ -87,14 +87,14 @@ namespace JinEngine
LUA_IMPLEMENT int l_close(lua_State* L)
{
- SocketRef socket = checkSocket(L);
+ SharedSocket socket = checkSocket(L);
socket->close();
return 0;
}
LUA_IMPLEMENT int l_configBlocking(lua_State* L)
{
- SocketRef socket = checkSocket(L);
+ SharedSocket socket = checkSocket(L);
bool blocking = luax_checkbool(L, 2);
socket->configureBlocking(blocking);
return 0;