Some more code refactorization

3 files changed, 7 insertions, 6 deletions

diff --git a/deep_test/deep_test.vcxproj b/deep_test/deep_test.vcxproj
index ddfad5d..175433b 100644
--- a/deep_test/deep_test.vcxproj
+++ b/deep_test/deep_test.vcxproj
@@ -710,13 +710,13 @@
     <ClCompile Include="..\src\compat.cpp" />
     <ClCompile Include="..\src\deep.cpp" />
     <ClCompile Include="..\src\tools.cpp" />
-    <ClCompile Include="..\src\universe.cpp" />
     <ClCompile Include="deep_test.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\compat.h" />
     <ClInclude Include="..\src\deep.h" />
     <ClInclude Include="..\src\tools.h" />
+    <ClInclude Include="..\src\uniquekey.h" />
     <ClInclude Include="..\src\universe.h" />
   </ItemGroup>
   <ItemGroup>
diff --git a/deep_test/deep_test.vcxproj.filters b/deep_test/deep_test.vcxproj.filters
index 814301f..84527af 100644
--- a/deep_test/deep_test.vcxproj.filters
+++ b/deep_test/deep_test.vcxproj.filters
@@ -24,9 +24,6 @@
     <ClCompile Include="..\src\tools.cpp">
       <Filter>Lanes</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\universe.cpp">
-      <Filter>Lanes</Filter>
-    </ClCompile>
     <ClCompile Include="deep_test.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -44,6 +41,9 @@
     <ClInclude Include="..\src\tools.h">
       <Filter>Lanes</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\uniquekey.h">
+      <Filter>Lanes</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="deeptest.lua">
diff --git a/deep_test/deeptest.lua b/deep_test/deeptest.lua
index 33de003..09b638c 100644
--- a/deep_test/deeptest.lua
+++ b/deep_test/deeptest.lua
@@ -7,7 +7,7 @@ local dt = lanes.require "deep_test"
 local test_deep = true
 local test_clonable = true
 local test_uvtype = "string"
-local nupvals = _VERSION == "Lua 5.4" and 2 or 1
+local nupvals = _VERSION == "Lua 5.4" and 3 or 1
 
 local makeUserValue = function( obj_)
         if test_uvtype == "string" then
@@ -43,7 +43,8 @@ local performTest = function( obj_)
         obj_:setuv( 1, makeUserValue( obj_))
         -- lua 5.4 supports multiple uservalues of arbitrary types
         if nupvals > 1 then
-                obj_:setuv( 2, "ENDUV")
+                -- keep uv #2 as nil
+                obj_:setuv( 3, "ENDUV")
         end
 
         local t =