*修改文件结构

6 files changed, 0 insertions, 470 deletions

diff --git a/src/lua/modules/net/je_lua_buffer.cpp b/src/lua/modules/net/je_lua_buffer.cpp
deleted file mode 100644
index 10e7143..0000000
--- a/src/lua/modules/net/je_lua_buffer.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-#include "common/je_lua_object.h"
-#include "common/je_lua_common.h"
-#include "libjin/jin.h"
-#include "je_lua_buffer.h"
-
-using namespace JinEngine::Lua::Net;
-
-namespace JinEngine
-{
-    namespace Lua
-    {
-
-        const char* Jin_Lua_Buffer = "Buffer";
-
-        static inline Net::Buffer* checkNetBuffer(lua_State* L)
-        {
-            LuaObject* luaObj = (LuaObject*)luax_checktype(L, 1, Jin_Lua_Buffer);
-            return luaObj->getObject<Net::Buffer>();
-        }
-
-        // net.Buffer:append(value) -> value_length
-        LUA_IMPLEMENT int l_append(lua_State* L)
-        {
-            Buffer* buffer = checkNetBuffer(L);
-            const int vp = 2;
-            if (luax_isintegerstrict(L, vp))
-            {
-                int n = luax_checkinteger(L, vp);
-                int size = sizeof(n);
-                buffer->append(&n, size);
-                luax_pushinteger(L, size);
-                return 1;
-            } 
-            else if (luax_isfloatstrict(L, vp))
-            {
-                float n = luax_checknumber(L, vp);
-                int size = sizeof(n);
-                buffer->append(&n, size);
-                luax_pushinteger(L, size);
-                return 1;
-            }
-            else if (luax_isbooleanstrict(L, vp))
-            {
-                bool n = luax_checkbool(L, vp);
-                int size = sizeof(n);
-                buffer->append(&n, size);
-                luax_pushinteger(L, size);
-                return 1;
-            }
-            else if (luax_isstringstrict(L, vp))
-            {
-                const char* str = luax_checkstring(L, vp);
-                int size = strlen(str) + 1;
-                buffer->append(str, size);
-                luax_pushinteger(L, size);
-                return 1;
-            }
-            else
-            {
-                luax_typerror(L, vp, "number, bool or string");
-                return 0;
-            }
-        }
-
-        // net.Buffer:grabString(offset) -> string, length
-        LUA_IMPLEMENT int l_grabString(lua_State* L)
-        {
-            Buffer* buffer = checkNetBuffer(L);
-            int offset = luax_checkinteger(L, 2);
-            unsigned int len;
-            char* data = buffer->grabString(&len, offset);
-            Array<char> str;
-            str.bind(data, len);
-            luax_pushstring(L, &str);
-            luax_pushinteger(L, str.count());
-            return 2;
-        }
-
-        // net.Buffer:grabInteger(offset) -> integer, length
-        LUA_IMPLEMENT int l_grabInteger(lua_State* L)
-        {
-            Buffer* buffer = checkNetBuffer(L);
-            int offset = luax_checkinteger(L, 2);
-            int len;
-            int integer = buffer->grabInteger(&len, offset);
-            luax_pushinteger(L, integer);
-            luax_pushinteger(L, len);
-            return 2;
-        }
-
-        LUA_IMPLEMENT int l_grabFloat(lua_State* L)
-        {
-            Buffer* buffer = checkNetBuffer(L);
-            int offset = luax_checkinteger(L, 2);
-            int len;
-            float floatv = buffer->grabFloat(&len, offset);
-            luax_pushnumber(L, floatv);
-            luax_pushinteger(L, len);
-            return 2;
-        }
-
-        LUA_IMPLEMENT int l_grabBoolean(lua_State* L)
-        {
-            Buffer* buffer = checkNetBuffer(L);
-            int offset = luax_checkinteger(L, 2);
-            int len;
-            bool boolean = buffer->grabBoolean(&len, offset);
-            luax_pushboolean(L, boolean);
-            luax_pushinteger(L, len);
-            return 2;
-        }
-
-        LUA_IMPLEMENT int l_gc(lua_State* L)
-        {
-            LuaObject* luaObj = (LuaObject*)luax_checktype(L, 1, Jin_Lua_Buffer);
-            luaObj->release();
-            return 0;
-        }
-
-        LUA_EXPORT void luaopen_Buffer(lua_State* L)
-        {
-            luaL_Reg netbuffer_function[] = {
-                { "__gc",           l_gc          },
-                { "append",         l_append      },
-                { "grabString",     l_grabString  },
-                { "grabInteger",    l_grabInteger },
-                { "grabBoolean",    l_grabBoolean },
-                { "grabFloat",      l_grabFloat   },
-                { 0,                0             }
-            };
-
-            luax_newtype(L, Jin_Lua_Buffer, netbuffer_function);
-        }
-
-    } // namespace Lua
-} // namespace JinEngine
\ No newline at end of file
diff --git a/src/lua/modules/net/je_lua_buffer.h b/src/lua/modules/net/je_lua_buffer.h
deleted file mode 100644
index 974e23a..0000000
--- a/src/lua/modules/net/je_lua_buffer.h
+++ /dev/null
@@ -1,102 +0,0 @@
-#ifndef __JIN_LUA_NET_NETBUFFER_H
-#define __JIN_LUA_NET_NETBUFFER_H
-
-#include <cstring>
-#include <cstdlib>
-#include "common/je_lua_common.h"
-
-namespace JinEngine
-{
-    namespace Lua
-    {
-
-        extern const char* Jin_Lua_Buffer;
-
-        void luaopen_Buffer(lua_State* L);
-
-        namespace Net
-        {
-
-            class Buffer : public Object
-            {
-            public:
-                Buffer(size_t s = 0)
-                    : size(s)
-                {
-                    buffer = new char[size];
-                    memset(buffer, 0, size);
-                }
-
-                Buffer(const char* data, size_t s)
-                    : size(s)
-                {
-                    buffer = new char[size];
-                    memcpy(buffer, data, size);
-                }
-
-                ~Buffer()
-                {
-                    if (buffer != nullptr)
-                    {
-                        delete[] buffer;
-                        buffer = nullptr;
-                        size = 0;
-                    }
-                }
-
-                void append(const void* data, size_t s)
-                {
-                    if (data == nullptr)
-                        return;
-                    char* buf = buffer;
-                    buffer = new char[size + s];
-                    memcpy(buffer, buf, size);
-                    memcpy(buffer + size, data, s);
-                    delete[] buf;
-                    size += s;
-                    return;
-                }
-
-                /* grab and create a string */
-                char* grabString(unsigned int* length, int offset = 0)
-                {
-                    int l = offset;
-                    for (; l < size; ++l)
-                    {
-                        if (buffer[l] == 0)
-                            break;
-                    }
-                    *length = l - offset + 1;
-                    char* str = (char*)malloc(*length);
-                    memcpy(str, buffer + offset, *length);
-                    return str;
-                }
-
-                int grabInteger(int* length, int offset = 0)
-                {
-                    *length = sizeof(int);
-                    return *((int*)(buffer + offset));
-                }
-
-                float grabFloat(int* length, int offset = 0)
-                {
-                    *length = sizeof(float);
-                    return *((float*)(buffer + offset));
-                }
-
-                bool grabBoolean(int* length, int offset = 0)
-                {
-                    *length = sizeof(bool);
-                    return *((bool*)(buffer + offset));
-                }
-
-                char* buffer;
-                size_t size;
-
-            };
-
-        } // namespace Net
-    } // namespace Lua
-} // namespace JinEngine
-
-#endif
\ No newline at end of file
diff --git a/src/lua/modules/net/je_lua_net.cpp b/src/lua/modules/net/je_lua_net.cpp
deleted file mode 100644
index fad6fc5..0000000
--- a/src/lua/modules/net/je_lua_net.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-#include "common/je_lua_object.h"
-#include "libjin/jin.h"
-#include "common/je_lua_common.h"
-
-#include "je_lua_buffer.h"
-#include "je_lua_socket.h"
-
-namespace JinEngine
-{
-    namespace Lua
-    {
-
-        using namespace JinEngine::Lua::Net;
-        using namespace JinEngine::Net;
-
-        LUA_IMPLEMENT int l_initNetwork(lua_State* L)
-        {
-            JinEngine::Net::NetManager::get()->start();
-            return 1;
-        }
-    
-        LUA_IMPLEMENT int l_Socket(lua_State* L)
-        {
-            SocketInformation info = { 0 };
-            {
-                const char* socketType = luax_checkstring(L, 1);
-                if (strcmp(socketType, "TCP") == 0)
-                    info.type = SocketType::TCP;
-                else if (strcmp(socketType, "UDP") == 0)
-                    info.type = SocketType::UDP;
-                else
-                {
-                    luax_error(L, "jin.net.Socket() first paramter wrong, must be TCP or UDP");
-                    return 0;
-                }
-                // type, port
-                if (luax_gettop(L) == 2)
-                {
-                    info.port = luax_checkinteger(L, 2);
-                }
-                // type, address, port
-                else if (luax_gettop(L) == 3)
-                {
-                    if (luax_isstringstrict(L, 2))
-                        info.address = tk_strtohl(luax_checkstring(L, 2));
-                    else if (luax_isintegerstrict(L, 2))
-                        info.address = luax_checkinteger(L, 2);
-                    info.port = luax_checkinteger(L, 3);
-                }
-            }
-            Socket* socket = new Socket(info);
-            LuaObject* luaObj = luax_newinstance(L, Jin_Lua_Socket, new Shared(socket));
-            return 1;
-        }
-
-        LUA_IMPLEMENT int l_Buffer(lua_State* L)
-        {
-            int size = luax_checkinteger(L, 1);
-            Net::Buffer* buffer = new Net::Buffer(size);
-            LuaObject* luaObj = luax_newinstance(L, Jin_Lua_Buffer, new Shared(buffer));
-            return 1;
-        }
-
-        LUA_EXPORT int luaopen_net(lua_State* L)
-        {
-            luaopen_Socket(L);
-            luaopen_Buffer(L);
-            luaL_Reg methods[] = {
-                { "init",      l_initNetwork },
-                { "newSocket", l_Socket      },
-                { "newBuffer", l_Buffer      },
-                { 0,           0             }
-            };
-            luax_newlib(L, methods);
-            return 1;
-        }
-
-    } // namespace Lua
-} // namespace JinEngine
\ No newline at end of file
diff --git a/src/lua/modules/net/je_lua_net.h b/src/lua/modules/net/je_lua_net.h
deleted file mode 100644
index 1542791..0000000
--- a/src/lua/modules/net/je_lua_net.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef __JE_LUA_NET_H__
-#define __JE_LUA_NET_H__
-
-namespace JinEngine
-{
-    namespace Lua
-    {
-
-        int luaopen_net(lua_State* L);
-
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/src/lua/modules/net/je_lua_socket.cpp b/src/lua/modules/net/je_lua_socket.cpp
deleted file mode 100644
index d6cfe91..0000000
--- a/src/lua/modules/net/je_lua_socket.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-#include "common/je_lua_object.h"
-#include "common/je_lua_common.h"
-#include "libjin/jin.h"
-#include "je_lua_buffer.h"
-
-using namespace JinEngine::Net;
-using namespace JinEngine::Lua::Net;
-
-namespace JinEngine
-{
-    namespace Lua
-    {
-
-        const char* Jin_Lua_Socket = "Socket";
-
-        const int BUFFER_SIZE = 1024;
-
-        LUA_IMPLEMENT inline Socket* checkSocket(lua_State* L, int pos = 1)
-        {
-            LuaObject* luaObj = (LuaObject*)luax_checktype(L, pos, Jin_Lua_Socket);
-            return luaObj->getObject<Socket>();
-        }
-
-        LUA_IMPLEMENT inline Buffer* checkNetBuffer(lua_State* L, int pos = 1)
-        {
-            LuaObject* luaObj = (LuaObject*)luax_checktype(L, pos, Jin_Lua_Buffer);
-            return luaObj->getObject<Buffer>();
-        }
-
-        // return net.Socket
-        LUA_IMPLEMENT int l_accept(lua_State* L) 
-        {
-            Socket* socket = checkSocket(L);
-            Socket* client = socket->accept();
-            LuaObject* luaObj = luax_newinstance(L, Jin_Lua_Socket, new Shared(client));
-            return 1;
-        }
-    
-        // return net.Buffer
-        LUA_IMPLEMENT int l_receive(lua_State* L) 
-        {
-            Socket* socket = checkSocket(L);
-            char buffer[BUFFER_SIZE] = {0};
-            int size = socket->receive(buffer, BUFFER_SIZE);
-            Net::Buffer* netBuffer = new Net::Buffer(buffer, size);
-            LuaObject* luaObj = luax_newinstance(L, Jin_Lua_Buffer, new Shared(netBuffer));
-            return 1;
-        }
-    
-        // Socket:receiveFrom(address, port)
-        LUA_IMPLEMENT int l_receiveFrom(lua_State* L) 
-        {
-            Socket* 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);
-            LuaObject* luaObj = luax_newinstance(L, Jin_Lua_Buffer, new Shared(netBuffer));
-            return 1;
-        }
-
-        // Socket:send(net.Buffer) -> data_length
-        LUA_IMPLEMENT int l_send(lua_State* L) 
-        {
-            Socket* socket = checkSocket(L);
-            Buffer* buffer = checkNetBuffer(L, 2);
-            int len = socket->send(buffer->buffer, buffer->size);
-            luax_pushinteger(L, len);
-            return 1;
-        }
-    
-        // Socket:sendTo(address, port, net.Buffer)
-        LUA_IMPLEMENT int l_sendTo(lua_State* L) 
-        {
-            Socket* socket = checkSocket(L);
-            int address = luax_checkinteger(L, 2);
-            int port = luax_checkinteger(L, 3);
-            Buffer* buffer = checkNetBuffer(L, 4);
-            socket->sendTo(buffer->buffer, buffer->size, address, port);
-            return 0;
-        }
-    
-        LUA_IMPLEMENT int l_close(lua_State* L) 
-        {
-            Socket* socket = checkSocket(L);
-            socket->close();
-            return 0;
-        }
-
-        LUA_IMPLEMENT int l_configBlocking(lua_State* L) 
-        {
-            Socket* socket = checkSocket(L);
-            bool blocking = luax_checkbool(L, 2);
-            socket->configureBlocking(blocking);
-            return 0;
-        }
-
-        LUA_IMPLEMENT int l_gc(lua_State* L)
-        {
-            LuaObject* luaObj = (LuaObject*)luax_checktype(L, 1, Jin_Lua_Socket);
-            luaObj->release();
-            return 0;
-        }
-
-        LUA_EXPORT void luaopen_Socket(lua_State* L)
-        {
-            luaL_Reg socket_function[] = {
-                { "__gc",           l_gc             },
-                { "accept",         l_accept         },
-                { "receive",        l_receive        },
-                { "receiveFrom",    l_receiveFrom    },
-                { "send",           l_send           },
-                { "sendTo",         l_sendTo         },
-                { "close",          l_close          },
-                { "configBlocking", l_configBlocking },
-                { 0,                0                }
-            };
-            luax_newtype(L, Jin_Lua_Socket, socket_function);
-        }
-
-    } // namespace Lua
-} // namespace JinEngine
\ No newline at end of file
diff --git a/src/lua/modules/net/je_lua_socket.h b/src/lua/modules/net/je_lua_socket.h
deleted file mode 100644
index b33fac6..0000000
--- a/src/lua/modules/net/je_lua_socket.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef __JE_LUA_SOCKET_H__
-#define __JE_LUA_SOCKET_H__
-
-namespace JinEngine
-{
-    namespace Lua
-    {
-
-        extern const char* Jin_Lua_Socket;
-
-        void luaopen_Socket(lua_State* L);
-
-    }
-}
-
-#endif
\ No newline at end of file