4 files changed, 309 insertions, 309 deletions

diff --git a/src/lua/modules/net/Buffer.cpp b/src/lua/modules/net/Buffer.cpp
index d4c687c..bf71fa7 100644
--- a/src/lua/modules/net/Buffer.cpp
+++ b/src/lua/modules/net/Buffer.cpp
@@ -4,139 +4,139 @@
 #include "libjin/jin.h"
 #include "Buffer.h"
 
-namespace jin
-{
-namespace lua
-{
-namespace net
+namespace JinEngine
 {
+    namespace Lua
+    {
+        namespace Net
+        {
 
-    using namespace JinEngine;
+            using namespace JinEngine;
 
-	typedef Ref<Buffer>& BufferRef;
+	        typedef Ref<Buffer>& BufferRef;
 
-    static inline BufferRef checkNetBuffer(lua_State* L)
-    {
-        Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_NETWORK_BUFFER);
-		return proxy->getRef<Buffer>();
-    }
+            static inline BufferRef checkNetBuffer(lua_State* L)
+            {
+                Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_NETWORK_BUFFER);
+		        return proxy->getRef<Buffer>();
+            }
 
-    // net.Buffer:append(value) -> value_length
-    static int l_append(lua_State* L)
-    {
-		BufferRef ref = 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);
-            luax_pushinteger(L, size);
-            return 1;
-        } 
-        else if (luax_isfloatstrict(L, vp))
-        {
-            float n = luax_checknumber(L, vp);
-            int size = sizeof(n);
-			ref->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);
-			ref->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;
-			ref->append(str, size);
-            luax_pushinteger(L, size);
-            return 1;
-        }
-        else
-        {
-            luax_typerror(L, vp, "number, bool or string");
-            return 0;
-        }
-    }
+            // net.Buffer:append(value) -> value_length
+            static int l_append(lua_State* L)
+            {
+		        BufferRef ref = 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);
+                    luax_pushinteger(L, size);
+                    return 1;
+                } 
+                else if (luax_isfloatstrict(L, vp))
+                {
+                    float n = luax_checknumber(L, vp);
+                    int size = sizeof(n);
+			        ref->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);
+			        ref->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;
+			        ref->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
-    static int l_grabString(lua_State* L)
-    {
-		BufferRef ref = checkNetBuffer(L);
-        int offset = luax_checkinteger(L, 2);
-        unsigned int len;
-        char* data = ref->grabString(&len, offset);
-        Array<char> str;
-        str.bind(data, len);
-        luax_pushstring(L, &str);
-        luax_pushinteger(L, str.count());
-        return 2;
-    }
+            // net.Buffer:grabString(offset) -> string, length
+            static int l_grabString(lua_State* L)
+            {
+		        BufferRef ref = checkNetBuffer(L);
+                int offset = luax_checkinteger(L, 2);
+                unsigned int len;
+                char* data = ref->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
-    static int l_grabInteger(lua_State* L)
-    {
-		BufferRef ref = checkNetBuffer(L);
-        int offset = luax_checkinteger(L, 2);
-        int len;
-        int integer = ref->grabInteger(&len, offset);
-        luax_pushinteger(L, integer);
-        luax_pushinteger(L, len);
-        return 2;
-    }
+            // net.Buffer:grabInteger(offset) -> integer, length
+            static int l_grabInteger(lua_State* L)
+            {
+		        BufferRef ref = checkNetBuffer(L);
+                int offset = luax_checkinteger(L, 2);
+                int len;
+                int integer = ref->grabInteger(&len, offset);
+                luax_pushinteger(L, integer);
+                luax_pushinteger(L, len);
+                return 2;
+            }
 
-    static int l_grabFloat(lua_State* L)
-    {
-		BufferRef ref = checkNetBuffer(L);
-        int offset = luax_checkinteger(L, 2);
-        int len;
-        float floatv = ref->grabFloat(&len, offset);
-        luax_pushnumber(L, floatv);
-        luax_pushinteger(L, len);
-        return 2;
-    }
+            static int l_grabFloat(lua_State* L)
+            {
+		        BufferRef ref = checkNetBuffer(L);
+                int offset = luax_checkinteger(L, 2);
+                int len;
+                float floatv = ref->grabFloat(&len, offset);
+                luax_pushnumber(L, floatv);
+                luax_pushinteger(L, len);
+                return 2;
+            }
 
-    static int l_grabBoolean(lua_State* L)
-    {
-		BufferRef ref = checkNetBuffer(L);
-        int offset = luax_checkinteger(L, 2);
-        int len;
-        bool boolean = ref->grabBoolean(&len, offset);
-        luax_pushboolean(L, boolean);
-        luax_pushinteger(L, len);
-        return 2;
-    }
+            static int l_grabBoolean(lua_State* L)
+            {
+		        BufferRef ref = checkNetBuffer(L);
+                int offset = luax_checkinteger(L, 2);
+                int len;
+                bool boolean = ref->grabBoolean(&len, offset);
+                luax_pushboolean(L, boolean);
+                luax_pushinteger(L, len);
+                return 2;
+            }
 
-    static int l_gc(lua_State* L)
-    {
-        Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_NETWORK_BUFFER);
-        proxy->release();
-        return 0;
-    }
+            static int l_gc(lua_State* L)
+            {
+                Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_NETWORK_BUFFER);
+                proxy->release();
+                return 0;
+            }
 
-    static const luaL_Reg netbuffer_function[] = {
-        { "__gc",           l_gc          },
-        { "append",         l_append      },
-        { "grabString",     l_grabString  },
-        { "grabInteger",    l_grabInteger },
-        { "grabBoolean",    l_grabBoolean },
-        { "grabFloat",      l_grabFloat   },
-        { 0,                0             }
-    };
+            static const luaL_Reg netbuffer_function[] = {
+                { "__gc",           l_gc          },
+                { "append",         l_append      },
+                { "grabString",     l_grabString  },
+                { "grabInteger",    l_grabInteger },
+                { "grabBoolean",    l_grabBoolean },
+                { "grabFloat",      l_grabFloat   },
+                { 0,                0             }
+            };
 
-} // net
+        } // Net
 
-    int luaopen_Buffer(lua_State* L)
-    {
-        luax_newtype(L, JIN_NETWORK_BUFFER, net::netbuffer_function);
-        return 0;
-    }
+        int luaopen_Buffer(lua_State* L)
+        {
+            luax_newtype(L, JIN_NETWORK_BUFFER, Net::netbuffer_function);
+            return 0;
+        }
 
-} // lua
-} // jin
\ No newline at end of file
+    } // Lua
+} // JinEngine
\ No newline at end of file
diff --git a/src/lua/modules/net/Buffer.h b/src/lua/modules/net/Buffer.h
index 172682d..eefbc32 100644
--- a/src/lua/modules/net/Buffer.h
+++ b/src/lua/modules/net/Buffer.h
@@ -5,93 +5,93 @@
 #include <cstdlib>
 #include "lua/common/common.h"
 
-namespace jin
+namespace JinEngine
 {
-namespace lua
-{
-namespace net
-{
-
-    class Buffer
+    namespace Lua
     {
-    public:
-        Buffer(size_t s = 0)
-            : size(s)
+        namespace Net
         {
-            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)
+            class Buffer
             {
-                delete[] buffer;
-                buffer = nullptr;
-                size = 0;
-            }
-        }
+            public:
+                Buffer(size_t s = 0)
+                    : size(s)
+                {
+                    buffer = new char[size];
+                    memset(buffer, 0, size);
+                }
 
-        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;
-        }
+                Buffer(const char* data, size_t s)
+                    : size(s)
+                {
+                    buffer = new char[size];
+                    memcpy(buffer, data, size);
+                }
 
-        /* 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;
-        }
+                ~Buffer()
+                {
+                    if (buffer != nullptr)
+                    {
+                        delete[] buffer;
+                        buffer = nullptr;
+                        size = 0;
+                    }
+                }
 
-        int grabInteger(int* length, int offset = 0)
-        {
-            *length = sizeof(int);
-            return *((int*)(buffer + offset));
-        }
+                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;
+                }
 
-        float grabFloat(int* length, int offset = 0)
-        {
-            *length = sizeof(float);
-            return *((float*)(buffer + offset));
-        }
+                /* 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;
+                }
 
-        bool grabBoolean(int* length, int offset = 0)
-        {
-            *length = sizeof(bool);
-            return *((bool*)(buffer + offset));
-        }
+                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;
+                char* buffer;
+                size_t size;
 
-    };
+            };
 
-} // net
-} // lua
-} // jin
+        } // Net
+    } // Lua
+} // JinEngine
 
 #endif
\ No newline at end of file
diff --git a/src/lua/modules/net/net.cpp b/src/lua/modules/net/net.cpp
index 37a5862..cc2b8de 100644
--- a/src/lua/modules/net/net.cpp
+++ b/src/lua/modules/net/net.cpp
@@ -4,12 +4,12 @@
 #include "lua/common/common.h"
 #include "Buffer.h"
 
-namespace jin
+namespace JinEngine
 {
-namespace lua
+namespace Lua
 {
 
-    using namespace jin::lua::net;
+    using namespace JinEngine::Lua::Net;
 	using namespace JinEngine::Net;
 
     static int l_initNetwork(lua_State* L)
@@ -57,7 +57,7 @@ namespace lua
     {
         int size = luax_checkinteger(L, 1);
         Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_NETWORK_BUFFER, sizeof(Proxy));
-        net::Buffer* buffer = new net::Buffer(size);
+        Net::Buffer* buffer = new Net::Buffer(size);
         proxy->bind(new Ref<Buffer>(buffer, JIN_NETWORK_BUFFER));
         return 1;
     }
@@ -82,5 +82,5 @@ namespace lua
         return 1;
     }
 
-} // lua
-} // jin
\ No newline at end of file
+} // Lua
+} // JinEngine
\ No newline at end of file
diff --git a/src/lua/modules/net/socket.cpp b/src/lua/modules/net/socket.cpp
index 4f67497..9164073 100644
--- a/src/lua/modules/net/socket.cpp
+++ b/src/lua/modules/net/socket.cpp
@@ -4,126 +4,126 @@
 #include "libjin/jin.h"
 #include "Buffer.h"
 
-namespace jin
-{
-namespace lua
+namespace JinEngine
 {
+    namespace Lua
+    {
 
-	using namespace JinEngine::Net;
-	using namespace lua::net;
+	    using namespace JinEngine::Net;
+	    using namespace Lua::Net;
 
-	typedef Ref<Socket>& SocketRef;
+	    typedef Ref<Socket>& SocketRef;
 
-    const int BUFFER_SIZE = 1024;
+        const int BUFFER_SIZE = 1024;
 
-    static inline SocketRef checkSocket(lua_State* L, int pos = 1)
-    {
-        Proxy* proxy = (Proxy*)luax_checktype(L, pos, JIN_NETWORK_SOCKET);
-		return proxy->getRef<Socket>();
-    }
+        static inline SocketRef checkSocket(lua_State* L, int pos = 1)
+        {
+            Proxy* proxy = (Proxy*)luax_checktype(L, pos, JIN_NETWORK_SOCKET);
+		    return proxy->getRef<Socket>();
+        }
 
-    static inline Ref<Buffer>& checkNetBuffer(lua_State* L, int pos = 1)
-    {
-        Proxy* proxy = (Proxy*)luax_checktype(L, pos, JIN_NETWORK_BUFFER);
-		return proxy->getRef<Buffer>();
-    }
+        static inline Ref<Buffer>& checkNetBuffer(lua_State* L, int pos = 1)
+        {
+            Proxy* proxy = (Proxy*)luax_checktype(L, pos, JIN_NETWORK_BUFFER);
+		    return proxy->getRef<Buffer>();
+        }
 
-    // return net.Socket
-    static int l_accept(lua_State* L) 
-    {
-		SocketRef socket = checkSocket(L);
-        Socket* client = socket->accept();
-        Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_NETWORK_SOCKET, sizeof(Proxy));
-        proxy->bind(new Ref<Socket>(client, JIN_NETWORK_SOCKET));
-        return 1;
-    }
+        // return net.Socket
+        static int l_accept(lua_State* L) 
+        {
+		    SocketRef socket = checkSocket(L);
+            Socket* client = socket->accept();
+            Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_NETWORK_SOCKET, sizeof(Proxy));
+            proxy->bind(new Ref<Socket>(client, JIN_NETWORK_SOCKET));
+            return 1;
+        }
     
-    // return net.Buffer
-    static int l_receive(lua_State* L) 
-    {
-		SocketRef 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));
-        net::Buffer* netBuffer = new net::Buffer(buffer, size);
-        proxy->bind(new Ref<Buffer>(netBuffer, JIN_NETWORK_BUFFER));
-        return 1;
-    }
+        // return net.Buffer
+        static int l_receive(lua_State* L) 
+        {
+		    SocketRef 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));
+            Net::Buffer* netBuffer = new Net::Buffer(buffer, size);
+            proxy->bind(new Ref<Buffer>(netBuffer, JIN_NETWORK_BUFFER));
+            return 1;
+        }
     
-    // Socket:receiveFrom(address, port)
-    static int l_receiveFrom(lua_State* L) 
-    {
-		SocketRef 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->bind(new Ref<Buffer>(netBuffer, JIN_NETWORK_BUFFER));
-        return 1;
-    }
+        // Socket:receiveFrom(address, port)
+        static int l_receiveFrom(lua_State* L) 
+        {
+		    SocketRef 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->bind(new Ref<Buffer>(netBuffer, JIN_NETWORK_BUFFER));
+            return 1;
+        }
 
-    // Socket:send(net.Buffer) -> data_length
-    static int l_send(lua_State* L) 
-    {
-		SocketRef socket = checkSocket(L);
-		Ref<Buffer>& ref = checkNetBuffer(L, 2);
-        int len = socket->send(ref->buffer, ref->size);
-        luax_pushinteger(L, len);
-        return 1;
-    }
+        // Socket:send(net.Buffer) -> data_length
+        static int l_send(lua_State* L) 
+        {
+		    SocketRef socket = checkSocket(L);
+		    Ref<Buffer>& ref = checkNetBuffer(L, 2);
+            int len = socket->send(ref->buffer, ref->size);
+            luax_pushinteger(L, len);
+            return 1;
+        }
     
-    // Socket:sendTo(address, port, net.Buffer)
-    static int l_sendTo(lua_State* L) 
-    {
-		SocketRef socket = checkSocket(L);
-        int address = luax_checkinteger(L, 2);
-        int port = luax_checkinteger(L, 3);
-		Ref<Buffer>& buffer = checkNetBuffer(L, 4);
-        socket->sendTo(buffer->buffer, buffer->size, address, port);
-        return 0;
-    }
+        // Socket:sendTo(address, port, net.Buffer)
+        static int l_sendTo(lua_State* L) 
+        {
+		    SocketRef socket = checkSocket(L);
+            int address = luax_checkinteger(L, 2);
+            int port = luax_checkinteger(L, 3);
+		    Ref<Buffer>& buffer = checkNetBuffer(L, 4);
+            socket->sendTo(buffer->buffer, buffer->size, address, port);
+            return 0;
+        }
     
-    static int l_close(lua_State* L) 
-    {
-		SocketRef socket = checkSocket(L);
-        socket->close();
-        return 0;
-    }
+        static int l_close(lua_State* L) 
+        {
+		    SocketRef socket = checkSocket(L);
+            socket->close();
+            return 0;
+        }
 
-    static int l_configBlocking(lua_State* L) 
-    {
-		SocketRef socket = checkSocket(L);
-        bool blocking = luax_checkbool(L, 2);
-        socket->configureBlocking(blocking);
-        return 0;
-    }
+        static int l_configBlocking(lua_State* L) 
+        {
+		    SocketRef socket = checkSocket(L);
+            bool blocking = luax_checkbool(L, 2);
+            socket->configureBlocking(blocking);
+            return 0;
+        }
 
-    static int l_gc(lua_State* L)
-    {
-        Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_NETWORK_SOCKET);
-        proxy->release();
-        return 0;
-    }
+        static int l_gc(lua_State* L)
+        {
+            Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_NETWORK_SOCKET);
+            proxy->release();
+            return 0;
+        }
 
-    static const 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                }
-    };
+        static const 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                }
+        };
 
-    int luaopen_Socket(lua_State* L)
-    {
-        luax_newtype(L, JIN_NETWORK_SOCKET, socket_function);
-        return 0;
-    }
+        int luaopen_Socket(lua_State* L)
+        {
+            luax_newtype(L, JIN_NETWORK_SOCKET, socket_function);
+            return 0;
+        }
 
-} // lua
-} // jin
\ No newline at end of file
+    } // Lua
+} // JinEngine
\ No newline at end of file