*update

1 files changed, 76 insertions, 138 deletions

diff --git a/src/lua/net/luaopen_Buffer.cpp b/src/lua/net/luaopen_Buffer.cpp
index 6e10f25..3a8353b 100644
--- a/src/lua/net/luaopen_Buffer.cpp
+++ b/src/lua/net/luaopen_Buffer.cpp
@@ -1,6 +1,7 @@
 #include "lua/luax.h"
 #include "../luaopen_types.h"
 #include "libjin/jin.h"
+#include "lua_net_Buffer.h"
 
 namespace jin
 {
@@ -9,183 +10,120 @@ namespace lua
 namespace net
 {
 
-    class Buffer
+    static inline Buffer* checkNetBuffer(lua_State* L)
     {
-    public:
-        Buffer(size_t size);
-        Buffer(const char* data, size_t size);
-        ~Buffer()
-        {
-        }
-
-        void append(char* data, size_t size)
-        {
-
-        }
-
-        const char* grabString(int offset = 0)
-        {
-            int l = offset;
-            for (; l < size; ++l)
-            {
-                if (buffer[l] == 0)
-                {
-
-                }
-            }
-            return nullptr;
-        }
-
-        int grabInteger(int offset = 0)
-        {
-
-        }
-
-        float grabfloat(int offset = 0)
-        {
-
-        }
-
-        bool grabboolean(int offset = 0)
-        {
-
-        }
-
-    private:
-        char* buffer;
-        size_t size;
-
-    };
-
-    static int l_buffer(lua_State* L)
-    {
-        int size = luax_checkinteger(L, 1);
-        char* buffer = (char*)malloc(size);
-        memset(buffer, 0, size);
-        luax_pushlstring(L, buffer, size);
-        return 1;
+        Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_NETWORK_BUFFER);
+        if (proxy != 0 && proxy != nullptr)
+            return (Buffer*)proxy->object;
+        return nullptr;
     }
 
-    // return buffer, size
-    static int l_write(lua_State* L)
+    // net.Buffer:append(value) -> value_length
+    static int l_append(lua_State* L)
     {
-        const char* data = luax_checklstring(L, 1, NULL);
-        int len = luax_checkinteger(L, 2);
-        if (luax_isinteger(L, 3))
+        Buffer* buffer = checkNetBuffer(L);
+        const int vp = 2;
+        if (luax_isinteger(L, vp))
         {
-            int n = luax_checkinteger(L, 3);
-            int size = len + sizeof(n);
-            char* buffer = (char*)malloc(size);
-            memcpy(buffer, data, len);
-            memcpy(buffer + len, &n, sizeof(n));
-            //free((void*)data);
-            luax_pushlstring(L, buffer, size);
+            int n = luax_checkinteger(L, vp);
+            int size = sizeof(n);
+            buffer->append(&n, size);
             luax_pushinteger(L, size);
-            return 2;
+            return 1;
         }
-        else if (luax_isfloat(L, 3))
+        else if (luax_isfloat(L, vp))
         {
-            float n = luax_checknumber(L, 3);
-            int size = len + sizeof(n);
-            char* buffer = (char*)malloc(size);
-            memcpy(buffer, data, len);
-            memcpy(buffer + len, &n, sizeof(n));
-            //free((void*)data);
-            luax_pushlstring(L, buffer, size);
+            float n = luax_checknumber(L, vp);
+            int size = sizeof(n);
+            buffer->append(&n, size);
             luax_pushinteger(L, size);
-            return 2;
+            return 1;
         }
-        else if (luax_isboolean(L, 3))
+        else if (luax_isboolean(L, vp))
         {
-            bool b = luax_checkbool(L, 3);
-            int size = len + sizeof(b);
-            char* buffer = (char*)malloc(size);
-            memcpy(buffer, data, len);
-            memcpy(buffer + len, &b, sizeof(b));
-            //free((void*)data);
-            luax_pushlstring(L, buffer, size);
+            bool n = luax_checkbool(L, vp);
+            int size = sizeof(n);
+            buffer->append(&n, size);
             luax_pushinteger(L, size);
-            return 2;
+            return 1;
         }
-        else if (luax_isstring(L, 3))
+        else if (luax_isstring(L, vp))
         {
-            const char* s = luax_checkstring(L, 3);
-            int l = strlen(s) + 1; // with \0
-            int size = len + l;
-            char* buffer = (char*)malloc(size);
-            memcpy(buffer, data, len);
-            memcpy(buffer + len, s, l);
-            luax_pushlstring(L, buffer, size);
+            const char* str = luax_checkstring(L, vp);
+            int size = strlen(str) + 1;
+            buffer->append(str, size);
             luax_pushinteger(L, size);
-            return 2;
+            return 1;
         }
         else
         {
-            luax_typerror(L, 3, "number, bool or string");
+            luax_typerror(L, vp, "number, bool or string");
             return 0;
         }
     }
 
-    // jin.shift(buffer, shift)
-    static int l_shift(lua_State* L)
+    // net.Buffer:grabString(offset) -> string, length
+    static int l_grabString(lua_State* L)
     {
-        const char* buffer = luax_checklstring(L, 1, NULL);
-        int size = luax_checkinteger(L, 2);
-        int shift = luax_checkinteger(L, 3);
-        int ss = size - shift;
-        luax_pushlstring(L, buffer + shift, ss);
-        luax_pushinteger(L, ss);
+        Buffer* buffer = checkNetBuffer(L);
+        int offset = luax_checkinteger(L, 2);
+        int len;
+        const char* str = buffer->grabString(&len, offset);
+        luax_pushstring(L, str);
+        luax_pushinteger(L, len);
         return 2;
     }
 
-    // jin.bit.grabstring(buffer, size)
-    static int l_grabstring(lua_State* L)
+    // net.Buffer:grabInteger(offset) -> integer, length
+    static int l_grabInteger(lua_State* L)
     {
-        const char* buffer = luax_checklstring(L, 1, NULL);
-        int size = luax_checkinteger(L, 2);
-        int l = 0;
-        for (; l < size; ++l)
-        {
-            if (buffer[l] == 0)
-            {
-                int len = l + 1;
-                char* str = (char*)malloc(len);
-                memcpy(str, buffer, len);
-                luax_pushstring(L, str);
-                luax_pushinteger(L, l);
-                return 2;
-            }
-        }
-        return 0;
+        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 1;
     }
 
-    static int l_grabinteger(lua_State* L)
+    static int l_grabFloat(lua_State* L)
     {
-        const char* buffer = luax_checklstring(L, 1, NULL);
-        int size = luax_checkinteger(L, 2);
-        int n = *((int*)buffer);
-        luax_pushinteger(L, n);
+        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 1;
     }
 
-    static int l_grabfloat(lua_State* L)
+    static int l_grabBoolean(lua_State* L)
     {
-        const char* buffer = luax_checklstring(L, 1, NULL);
-        int size = luax_checkinteger(L, 2);
-        float n = *((float*)buffer);
-        luax_pushnumber(L, n);
+        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 1;
     }
 
-    static int l_grabboolean(lua_State* L)
+    static const luaL_Reg netbuffer_function[] = {
+        { "append",         l_append },
+        { "grabString",     l_grabString },
+        { "grabInteger",    l_grabInteger },
+        { "grabBoolean",    l_grabBoolean },
+        { "grabFloat",      l_grabFloat },
+        { 0, 0 }
+    };
+
+} // net
+
+    int luaopen_Buffer(lua_State* L)
     {
-        const char* buffer = luax_checklstring(L, 1, NULL);
-        int size = luax_checkinteger(L, 2);
-        bool n = *((bool*)buffer);
-        luax_pushboolean(L, n);
-        return 1;
+        luax_newtype(L, JIN_NETWORK_BUFFER, net::netbuffer_function);
+        return 0;
     }
 
-} // net
 } // lua
 } // jin
\ No newline at end of file