*merge from minimal

1 files changed, 124 insertions, 118 deletions

diff --git a/src/lua/modules/net/Buffer.cpp b/src/lua/modules/net/Buffer.cpp
index 3354518..ddfbd6b 100644
--- a/src/lua/modules/net/Buffer.cpp
+++ b/src/lua/modules/net/Buffer.cpp
@@ -4,133 +4,139 @@
 #include "libjin/jin.h"
 #include "Buffer.h"
 
-namespace jin
+namespace JinEngine
 {
-namespace lua
-{
-namespace net
-{
-
-    static inline Ref<Buffer>& checkNetBuffer(lua_State* L)
+    namespace Lua
     {
-        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)
-    {
-		Ref<Buffer>& 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))
+        namespace Net
         {
-            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)
-    {
-		Ref<Buffer>& ref = checkNetBuffer(L);
-        int offset = luax_checkinteger(L, 2);
-        int len;
-        const char* str = ref->grabString(&len, offset);
-        luax_pushstring(L, str);
-        luax_pushinteger(L, len);
-        return 2;
-    }
+            using namespace JinEngine;
 
-    // net.Buffer:grabInteger(offset) -> integer, length
-    static int l_grabInteger(lua_State* L)
-    {
-		Ref<Buffer>& 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;
-    }
+	        typedef Ref<Buffer>& BufferRef;
 
-    static int l_grabFloat(lua_State* L)
-    {
-		Ref<Buffer>& 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 inline BufferRef checkNetBuffer(lua_State* L)
+            {
+                Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_NETWORK_BUFFER);
+		        return proxy->getRef<Buffer>();
+            }
 
-    static int l_grabBoolean(lua_State* L)
-    {
-		Ref<Buffer>& 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;
-    }
+            // 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;
+                }
+            }
 
-    static int l_gc(lua_State* L)
-    {
-        Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_NETWORK_BUFFER);
-        proxy->release();
-        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;
+            }
 
-    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.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
+            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;
+            }
 
-    int luaopen_Buffer(lua_State* L)
-    {
-        luax_newtype(L, JIN_NETWORK_BUFFER, net::netbuffer_function);
-        return 0;
-    }
+            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 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             }
+            };
+
+        } // namespace Net
+
+        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
+    } // namespace Lua
+} // namespace JinEngine
\ No newline at end of file