Fix clonable userdata uservalue transfer

6 files changed, 51 insertions, 14 deletions

diff --git a/deep_test/deep_test.c b/deep_test/deep_test.c
index 7edd33f..9585a3c 100644
--- a/deep_test/deep_test.c
+++ b/deep_test/deep_test.c
@@ -6,6 +6,7 @@
 #include "lauxlib.h"
 
 #include "deep.h"
+#include "compat.h"
 
 #if (defined PLATFORM_WIN32) || (defined PLATFORM_POCKETPC)
 #define LANES_API __declspec(dllexport)
@@ -123,6 +124,27 @@ static int clonable_set( lua_State* L)
 
 // ################################################################################################
 
+static int clonable_setuv( lua_State* L)
+{
+        struct s_MyClonableUserdata* self = (struct s_MyClonableUserdata*) lua_touserdata( L, 1);
+        int uv = (int) luaL_optinteger( L, 2, 1);
+        lua_settop( L, 3);
+        lua_pushboolean( L, lua_setiuservalue( L, 1, uv) != 0);
+        return 1;
+}
+
+// ################################################################################################
+
+static int clonable_getuv( lua_State* L)
+{
+        struct s_MyClonableUserdata* self = (struct s_MyClonableUserdata*) lua_touserdata( L, 1);
+        int uv = (int) luaL_optinteger( L, 2, 1);
+        lua_getiuservalue( L, 1, uv);
+        return 1;
+}
+
+// ################################################################################################
+
 static int clonable_tostring(lua_State* L)
 {
         struct s_MyClonableUserdata* self = (struct s_MyClonableUserdata*) lua_touserdata( L, 1);
@@ -170,6 +192,8 @@ static luaL_Reg const clonable_mt[] =
         { "__gc", clonable_gc},
         { "__lanesclone", clonable_lanesclone},
         { "set", clonable_set},
+        { "setuv", clonable_setuv},
+        { "getuv", clonable_getuv},
         { NULL, NULL }
 };
 
@@ -177,7 +201,8 @@ static luaL_Reg const clonable_mt[] =
 
 int luaD_new_clonable( lua_State* L)
 {
-        lua_newuserdata( L, sizeof( struct s_MyClonableUserdata));
+        int nuv = (int) luaL_optinteger( L, 1, 1);
+        lua_newuserdatauv( L, sizeof( struct s_MyClonableUserdata), nuv);
         luaL_setmetatable( L, "clonable");
         return 1;
 }
diff --git a/deep_test/deep_test.vcxproj b/deep_test/deep_test.vcxproj
index 110a191..d94b855 100644
--- a/deep_test/deep_test.vcxproj
+++ b/deep_test/deep_test.vcxproj
@@ -65,7 +65,7 @@
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.3|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
@@ -132,6 +132,10 @@
       <AdditionalDependencies>lua53.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(SolutionDir)..\lualib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
+    <PostBuildEvent>
+      <Command>xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\framework\</Command>
+      <Message>Copy to framework</Message>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'">
     <ClCompile>
@@ -224,11 +228,13 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\src\compat.c" />
     <ClCompile Include="..\src\deep.c" />
     <ClCompile Include="..\src\universe.c" />
     <ClCompile Include="deep_test.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\src\compat.h" />
     <ClInclude Include="..\src\deep.h" />
     <ClInclude Include="..\src\universe.h" />
   </ItemGroup>
diff --git a/deep_test/deep_test.vcxproj.filters b/deep_test/deep_test.vcxproj.filters
index b5c696f..93f6148 100644
--- a/deep_test/deep_test.vcxproj.filters
+++ b/deep_test/deep_test.vcxproj.filters
@@ -24,6 +24,9 @@
     <ClCompile Include="..\src\universe.c">
       <Filter>Lanes</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\compat.c">
+      <Filter>Lanes</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\deep.h">
@@ -32,6 +35,9 @@
     <ClInclude Include="..\src\universe.h">
       <Filter>Lanes</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\compat.h">
+      <Filter>Lanes</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="deeptest.lua">
diff --git a/deep_test/deep_test.vcxproj.user b/deep_test/deep_test.vcxproj.user
index 372bf91..f6a2db8 100644
--- a/deep_test/deep_test.vcxproj.user
+++ b/deep_test/deep_test.vcxproj.user
@@ -3,7 +3,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'">
     <LocalDebuggerCommand>D:\Boulot\anubis\Lua\framework\lua53.exe</LocalDebuggerCommand>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-    <LocalDebuggerCommandArguments>-i deeptest.lua</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>-i -- deeptest.lua</LocalDebuggerCommandArguments>
     <LocalDebuggerWorkingDirectory>D:\Boulot\anubis\Lua\bindings\Lanes\lanes\deep_test\</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'">
diff --git a/deep_test/deeptest.lua b/deep_test/deeptest.lua
index c0bbab4..16059d9 100644
--- a/deep_test/deeptest.lua
+++ b/deep_test/deeptest.lua
@@ -4,16 +4,17 @@ local l = lanes.linda "my linda"
 -- we will transfer userdata created by this module, so we need to make Lanes aware of it
 local dt = lanes.require "deep_test"
 
-local test_deep = true
-local test_clonable = false
+local test_deep = false
+local test_clonable = true
 
 local performTest = function( obj_)
-        obj_:set(666)
+        obj_:set( 666)
+        obj_:setuv( 1, "my uservalue")
         print( "immediate:", obj_)
 
         l:set( "key", obj_)
         local out = l:get( "key")
-        print( "out of linda:", out)
+        print( "out of linda:", out, out:getuv( 1))
 
         local g = lanes.gen(
                 "package"
@@ -21,13 +22,13 @@ local performTest = function( obj_)
                         required = { "deep_test"} -- we will transfer userdata created by this module, so we need to make this lane aware of it
                 }
                 , function( obj_)
-                        print( "in lane:", obj_)
+                        print( "in lane:", obj_, obj_:getuv( 1))
                         return obj_
                 end
         )
         h = g( obj_)
         local from_lane = h[1]
-        print( "from lane:", from_lane)
+        print( "from lane:", from_lane, from_lane:getuv( 1))
 end
 
 if test_deep then
diff --git a/src/tools.c b/src/tools.c
index ff23e36..48e904c 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -1907,13 +1907,14 @@ static bool_t inter_copy_function( Universe* U, lua_State* L2, uint_t L2_cache_i
                 {
                         int const clone_i = lua_gettop( L2);
                         int uvi = 0;
-                        while( lua_getiuservalue( L, i, uvi + 1) != LUA_TNONE)                 // ... u uv
+                        while( lua_getiuservalue( L, -1, uvi + 1) != LUA_TNONE)                // ... u uv
                         {
                                 luaG_inter_move( U, L, L2, 1, mode_);                                // ... u                      // ... mt __lanesclone nil [uv]+
                                 ++ uvi;
                         }
-                        // when lua_getiuservalue() returned LUA_TNONE, it pushed a nil. pop it now
-                        lua_pop( L, 1);                                                        // ... u
+                        // when lua_getiuservalue() returned LUA_TNONE, it pushed a nil. pop it now at the same time as the rest
+                        lua_pop( L, 2);                                                        // ... u
+                        STACK_MID( L, 0);                                                      // ...
                         // create the clone userdata with the required number of uservalue slots
                         clone = lua_newuserdatauv( L2, userdata_size, uvi);                                                  // ... mt __lanesclone nil [uv]+ u
                         lua_replace( L2, clone_i);                                                                           // ... mt __lanesclone u [uv]+
@@ -1927,13 +1928,11 @@ static bool_t inter_copy_function( Universe* U, lua_State* L2, uint_t L2_cache_i
                         // when we are done, all uservalues are popped from the stack
                         STACK_MID( L2, 3);                                                                                   // ... mt __lanesclone u
                 }
-                STACK_MID( L, 1);                                                        // u
                 lua_insert( L2, -3);                                                                                   // ... u mt __lanesclone
                 lua_pushlightuserdata( L2, clone);                                                                     // ... u mt __lanesclone clone
                 lua_pushlightuserdata( L2, source);                                                                    // ... u mt __lanesclone clone source
                 lua_call( L2, 2, 0);                                                                                   // ... u mt
                 lua_setmetatable( L2, -2);                                                                             // ... u
-                lua_pop( L, 1);                                                          // ...
         }
         else
         {