Deep userdata improvements

Support for user-provided __gc
Improved example

2 files changed, 45 insertions, 15 deletions

diff --git a/deep_test/deep_test.c b/deep_test/deep_test.c
index a48ecb2..abe9fdc 100644
--- a/deep_test/deep_test.c
+++ b/deep_test/deep_test.c
@@ -1,3 +1,5 @@
+#include <malloc.h>
+
 #include "lua.h"
 #include "lualib.h"
 #include "lauxlib.h"
@@ -10,19 +12,46 @@
 #define LANES_API
 #endif // (defined PLATFORM_WIN32) || (defined PLATFORM_POCKETPC)
 
+struct s_MyDeepUserdata
+{
+        lua_Integer val;
+};
+static void* deep_test_id( lua_State* L, enum eDeepOp op_);
+
+// ################################################################################################
+
+static int deep_set( lua_State* L)
+{
+        struct s_MyDeepUserdata* self = luaG_todeep( L, deep_test_id, 1);
+        lua_Integer i = lua_tointeger( L, 2);
+        self->val = i;
+        return 0;
+}
+
 // ################################################################################################
 
-static int deep_tostring(lua_State* L)
+static int deep_tostring( lua_State* L)
 {
-        lua_pushliteral( L, "I am a deep_test");
+        struct s_MyDeepUserdata* self = luaG_todeep( L, deep_test_id, 1);
+        lua_pushfstring( L, "deep_test(%d)", self->val);
         return 1;
 }
 
 // ################################################################################################
 
+static int deep_gc( lua_State* L)
+{
+        struct s_MyDeepUserdata* self = luaG_todeep( L, deep_test_id, 1);
+        return 0;
+}
+
+// ################################################################################################
+
 static luaL_Reg const deep_mt[] =
 {
         { "__tostring", deep_tostring},
+        { "__gc", deep_gc},
+        { "set", deep_set},
         { NULL, NULL }
 };
 
@@ -34,26 +63,25 @@ static void* deep_test_id( lua_State* L, enum eDeepOp op_)
         {
                 case eDO_new:
                 {
-                        void* allocUD;
-                        lua_Alloc allocF = lua_getallocf( L, &allocUD);
-                        void* deep_test = allocF( allocUD, NULL, 0, sizeof(void*));
+                        struct s_MyDeepUserdata* deep_test = (struct s_MyDeepUserdata*) malloc( sizeof(struct s_MyDeepUserdata));
+                        deep_test->val = 0;
                         return deep_test;
                 }
 
                 case eDO_delete:
                 {
-                        void* allocUD;
-                        lua_Alloc allocF = lua_getallocf( L, &allocUD);
-                        void* deep_test = lua_touserdata( L, 1);
-                        allocF( allocUD, deep_test, sizeof(void*), 0);
+                        struct s_MyDeepUserdata* deep_test = (struct s_MyDeepUserdata*) lua_touserdata( L, 1);
+                        free( deep_test);
                         return NULL;
                 }
 
                 case eDO_metatable:
                 {
-                        lua_newtable( L);
-                        luaL_setfuncs( L, deep_mt, 0);
-                        luaG_pushdeepversion( L);
+                        lua_newtable( L);                          // mt
+                        luaL_setfuncs( L, deep_mt, 0);             // mt
+                        lua_pushvalue( L, -1);                     // mt mt
+                        lua_setfield( L, -2, "__index");           // mt
+                        luaG_pushdeepversion( L);                  // mt version
                         return NULL;
                 }
 
@@ -69,7 +97,7 @@ static void* deep_test_id( lua_State* L, enum eDeepOp op_)
 
 // ################################################################################################
 
-int luaD_new_deep(lua_State* L)
+int luaD_new_deep( lua_State* L)
 {
         return luaG_newdeepuserdata( L, deep_test_id);
 }
diff --git a/deep_test/deep_test.lua b/deep_test/deep_test.lua
index 034c07d..fd78115 100644
--- a/deep_test/deep_test.lua
+++ b/deep_test/deep_test.lua
@@ -1,13 +1,15 @@
 -- create a deep-aware full userdata while Lanes isn't loaded
 local dt = require "deep_test"
 local deep = dt.new_deep()
+deep:set(666)
 print( deep)
 
 -- now load Lanes and see if that userdata is transferable
-
+--[[
 local lanes = require("lanes").configure()
 
 local l = lanes.linda "my linda"
 l.put( "key", deep)
 local out = l.get( "key")
-print( out)
\ No newline at end of file
+print( out)
+]]
\ No newline at end of file