C++ migration: make deep_test build and run

4 files changed, 82 insertions, 89 deletions

diff --git a/deep_test/deep_test.c b/deep_test/deep_test.cpp
index eca7479..bbae48e 100644
--- a/deep_test/deep_test.c
+++ b/deep_test/deep_test.cpp
@@ -1,29 +1,59 @@
+#include "lanes/src/deep.h"
+#include "lanes/src/compat.h"
+
 #include <malloc.h>
 #include <memory.h>
 #include <assert.h>
 
-#include "lua.h"
-#include "lualib.h"
-#include "lauxlib.h"
-
-#include "lanes/src/deep.h"
-#include "lanes/src/compat.h"
-
 // ################################################################################################
 
 // a lanes-deep userdata. needs DeepPrelude and luaG_newdeepuserdata from Lanes code.
-struct s_MyDeepUserdata
+struct MyDeepUserdata
 {
         DeepPrelude prelude; // Deep userdata MUST start with this header
-        lua_Integer val;
+        lua_Integer val{ 0 };
 };
-static void* deep_test_id( lua_State* L, enum eDeepOp op_);
+
+// ################################################################################################
+
+static void* deep_test_id( lua_State* L, DeepOp op_)
+{
+        switch( op_)
+        {
+                case eDO_new:
+                {
+                        MyDeepUserdata* deep_test = new MyDeepUserdata;
+                        return deep_test;
+                }
+
+                case eDO_delete:
+                {
+                        MyDeepUserdata* deep_test = static_cast<MyDeepUserdata*>(lua_touserdata( L, 1));
+                        delete deep_test;
+                        return nullptr;
+                }
+
+                case eDO_metatable:
+                {
+                        luaL_getmetatable( L, "deep");             // mt
+                        return nullptr;
+                }
+
+                case eDO_module:
+                return (void*)"deep_test";
+
+                default:
+                {
+                        return nullptr;
+                }
+        }
+}
 
 // ################################################################################################
 
 static int deep_set( lua_State* L)
 {
-        struct s_MyDeepUserdata* self = luaG_todeep( L, deep_test_id, 1);
+        MyDeepUserdata* self = static_cast<MyDeepUserdata*>(luaG_todeep(L, deep_test_id, 1));
         lua_Integer i = lua_tointeger( L, 2);
         self->val = i;
         return 0;
@@ -34,8 +64,8 @@ static int deep_set( lua_State* L)
 // won't actually do anything as deep userdata don't have uservalue slots
 static int deep_setuv( lua_State* L)
 {
-        struct s_MyDeepUserdata* self = luaG_todeep( L, deep_test_id, 1);
-        int uv = (int) luaL_optinteger( L, 2, 1);
+        MyDeepUserdata* self = static_cast<MyDeepUserdata*>(luaG_todeep(L, deep_test_id, 1));
+        int uv = (int) luaL_optinteger(L, 2, 1);
         lua_settop( L, 3);
         lua_pushboolean( L, lua_setiuservalue( L, 1, uv) != 0);
         return 1;
@@ -46,8 +76,8 @@ static int deep_setuv( lua_State* L)
 // won't actually do anything as deep userdata don't have uservalue slots
 static int deep_getuv( lua_State* L)
 {
-        struct s_MyDeepUserdata* self = luaG_todeep( L, deep_test_id, 1);
-        int uv = (int) luaL_optinteger( L, 2, 1);
+        MyDeepUserdata* self = static_cast<MyDeepUserdata*>(luaG_todeep(L, deep_test_id, 1));
+        int uv = (int) luaL_optinteger(L, 2, 1);
         lua_getiuservalue( L, 1, uv);
         return 1;
 }
@@ -56,8 +86,8 @@ static int deep_getuv( lua_State* L)
 
 static int deep_tostring( lua_State* L)
 {
-        struct s_MyDeepUserdata* self = luaG_todeep( L, deep_test_id, 1);
-        lua_pushfstring( L, "%p:deep(%d)", lua_topointer( L, 1), self->val);
+        MyDeepUserdata* self = static_cast<MyDeepUserdata*>(luaG_todeep(L, deep_test_id, 1));
+        lua_pushfstring(L, "%p:deep(%d)", lua_topointer(L, 1), self->val);
         return 1;
 }
 
@@ -65,7 +95,7 @@ static int deep_tostring( lua_State* L)
 
 static int deep_gc( lua_State* L)
 {
-        struct s_MyDeepUserdata* self = luaG_todeep( L, deep_test_id, 1);
+        MyDeepUserdata* self = static_cast<MyDeepUserdata*>(luaG_todeep(L, deep_test_id, 1));
         return 0;
 }
 
@@ -78,48 +108,11 @@ static luaL_Reg const deep_mt[] =
         { "set", deep_set},
         { "setuv", deep_setuv},
         { "getuv", deep_getuv},
-        { NULL, NULL }
+        { nullptr, nullptr }
 };
 
 // ################################################################################################
 
-static void* deep_test_id( lua_State* L, enum eDeepOp op_)
-{
-        switch( op_)
-        {
-                case eDO_new:
-                {
-                        struct s_MyDeepUserdata* deep_test = (struct s_MyDeepUserdata*) malloc( sizeof(struct s_MyDeepUserdata));
-                        deep_test->prelude.magic.value = DEEP_VERSION.value;
-                        deep_test->val = 0;
-                        return deep_test;
-                }
-
-                case eDO_delete:
-                {
-                        struct s_MyDeepUserdata* deep_test = (struct s_MyDeepUserdata*) lua_touserdata( L, 1);
-                        free( deep_test);
-                        return NULL;
-                }
-
-                case eDO_metatable:
-                {
-                        luaL_getmetatable( L, "deep");             // mt
-                        return NULL;
-                }
-
-                case eDO_module:
-                return "deep_test";
-
-                default:
-                {
-                        return NULL;
-                }
-        }
-}
-
-// ################################################################################################
-
 int luaD_new_deep( lua_State* L)
 {
         int nuv = (int) luaL_optinteger( L, 1, 0);
@@ -131,7 +124,7 @@ int luaD_new_deep( lua_State* L)
 // ################################################################################################
 // ################################################################################################
 
-struct s_MyClonableUserdata
+struct MyClonableUserdata
 {
         lua_Integer val;
 };
@@ -140,8 +133,8 @@ struct s_MyClonableUserdata
 
 static int clonable_set( lua_State* L)
 {
-        struct s_MyClonableUserdata* self = (struct s_MyClonableUserdata*) lua_touserdata( L, 1);
-        lua_Integer i = lua_tointeger( L, 2);
+        MyClonableUserdata* self = static_cast<MyClonableUserdata*>(lua_touserdata(L, 1));
+        lua_Integer i = lua_tointeger(L, 2);
         self->val = i;
         return 0;
 }
@@ -150,8 +143,8 @@ 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);
+        MyClonableUserdata* self = static_cast<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;
@@ -161,8 +154,8 @@ static int clonable_setuv( lua_State* L)
 
 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);
+        MyClonableUserdata* self = static_cast<MyClonableUserdata*>(lua_touserdata(L, 1));
+        int uv = (int) luaL_optinteger(L, 2, 1);
         lua_getiuservalue( L, 1, uv);
         return 1;
 }
@@ -171,8 +164,8 @@ static int clonable_getuv( lua_State* L)
 
 static int clonable_tostring(lua_State* L)
 {
-        struct s_MyClonableUserdata* self = (struct s_MyClonableUserdata*) lua_touserdata( L, 1);
-        lua_pushfstring( L, "%p:clonable(%d)", lua_topointer( L, 1), self->val);
+        MyClonableUserdata* self = static_cast<MyClonableUserdata*>(lua_touserdata(L, 1));
+        lua_pushfstring(L, "%p:clonable(%d)", lua_topointer(L, 1), self->val);
         return 1;
 }
 
@@ -180,7 +173,7 @@ static int clonable_tostring(lua_State* L)
 
 static int clonable_gc( lua_State* L)
 {
-        struct s_MyClonableUserdata* self = (struct s_MyClonableUserdata*) lua_touserdata( L, 1);
+        MyClonableUserdata* self = static_cast<MyClonableUserdata*>(lua_touserdata(L, 1));
         return 0;
 }
 
@@ -193,10 +186,10 @@ static int clonable_lanesclone( lua_State* L)
         {
                 case 3:
                 {
-                        struct s_MyClonableUserdata* self = lua_touserdata( L, 1);
-                        struct s_MyClonableUserdata* from = lua_touserdata( L, 2);
+                        MyClonableUserdata* self = static_cast<MyClonableUserdata*>(lua_touserdata(L, 1));
+                        MyClonableUserdata* from = static_cast<MyClonableUserdata*>(lua_touserdata(L, 2));
                         size_t len = lua_tointeger( L, 3);
-                        assert( len == sizeof(struct s_MyClonableUserdata));
+                        assert( len == sizeof(MyClonableUserdata));
                         *self = *from;
                 }
                 return 0;
@@ -217,7 +210,7 @@ static luaL_Reg const clonable_mt[] =
         { "set", clonable_set},
         { "setuv", clonable_setuv},
         { "getuv", clonable_getuv},
-        { NULL, NULL }
+        { nullptr, nullptr }
 };
 
 // ################################################################################################
@@ -225,7 +218,7 @@ static luaL_Reg const clonable_mt[] =
 int luaD_new_clonable( lua_State* L)
 {
         int nuv = (int) luaL_optinteger( L, 1, 1);
-        lua_newuserdatauv( L, sizeof( struct s_MyClonableUserdata), nuv);
+        lua_newuserdatauv( L, sizeof(MyClonableUserdata), nuv);
         luaL_setmetatable( L, "clonable");
         return 1;
 }
@@ -237,7 +230,7 @@ static luaL_Reg const deep_module[] =
 {
         { "new_deep", luaD_new_deep},
         { "new_clonable", luaD_new_clonable},
-        { NULL, NULL}
+        { nullptr, nullptr }
 };
 
 // ################################################################################################
diff --git a/deep_test/deep_test.vcxproj b/deep_test/deep_test.vcxproj
index 730c137..1b4f57b 100644
--- a/deep_test/deep_test.vcxproj
+++ b/deep_test/deep_test.vcxproj
@@ -675,11 +675,11 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\compat.c" />
-    <ClCompile Include="..\src\deep.c" />
-    <ClCompile Include="..\src\tools.c" />
-    <ClCompile Include="..\src\universe.c" />
-    <ClCompile Include="deep_test.c" />
+    <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" />
diff --git a/deep_test/deep_test.vcxproj.filters b/deep_test/deep_test.vcxproj.filters
index be47da9..814301f 100644
--- a/deep_test/deep_test.vcxproj.filters
+++ b/deep_test/deep_test.vcxproj.filters
@@ -15,21 +15,21 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="deep_test.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\deep.c">
+    <ClCompile Include="..\src\compat.cpp">
       <Filter>Lanes</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\universe.c">
+    <ClCompile Include="..\src\deep.cpp">
       <Filter>Lanes</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\compat.c">
+    <ClCompile Include="..\src\tools.cpp">
       <Filter>Lanes</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\tools.c">
+    <ClCompile Include="..\src\universe.cpp">
       <Filter>Lanes</Filter>
     </ClCompile>
+    <ClCompile Include="deep_test.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\deep.h">
diff --git a/docs/index.html b/docs/index.html
index aed022a..e9c3239 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -917,7 +917,7 @@
         </table>
 
 <p>
-        Only available if lane tracking feature is compiled (see <tt>HAVE_LANE_TRACKING</tt> in <tt>lanes.c</tt>) and <a href="#track_lanes"><tt>track_lanes</tt></a> is set.
+        Only available if lane tracking feature is compiled (see <tt>HAVE_LANE_TRACKING</tt> in <tt>lanes.cpp</tt>) and <a href="#track_lanes"><tt>track_lanes</tt></a> is set.
         <br/>
         Returns an array table where each entry is a table containing a lane's name and status. Returns <tt>nil</tt> if no lane is running.
 </p>
@@ -1702,9 +1702,9 @@ int luaD_new_clonable( lua_State* L)
                         <li><tt>eDO_metatable</tt>: should build a metatable for the object. Don't cache the metatable yourself, Lanes takes care of it (<tt>eDO_metatable</tt> should only be invoked once per state). Just push the metatable on the stack.</li>
                         <li><tt>eDO_module</tt>: requests the name of the module that exports the idfunc, to be returned. It is necessary so that Lanes can require it in any lane state that receives a userdata. This is to prevent crashes in situations where the module could be unloaded while the idfunc pointer is still held.</li>
                 </ul>
-                Take a look at <tt>linda_id</tt> in <tt>lanes.c</tt> or <tt>deep_test_id</tt> in <tt>deep_test.c</tt>.
+                Take a look at <tt>linda_id</tt> in <tt>lanes.cpp</tt> or <tt>deep_test_id</tt> in <tt>deep_test.cpp</tt>.
         </li>
-        <li>Include <tt>"deep.h"</tt> and either link against Lanes or statically compile <tt>compat.c deep.c tools.c universe.c</tt> into your module if you want to avoid a runtime dependency for users that will use your module without Lanes.
+        <li>Include <tt>"deep.h"</tt> and either link against Lanes or statically compile <tt>compat.cpp deep.cpp tools.cpp universe.cpp</tt> into your module if you want to avoid a runtime dependency for users that will use your module without Lanes.
         <li>Instanciate your userdata using <tt>luaG_newdeepuserdata()</tt>, instead of the regular <tt>lua_newuserdata()</tt>. Given an <tt>idfunc</tt>, it sets up the support structures and returns a state-specific proxy userdata for accessing your data. This proxy can also be copied over to other lanes.</li>
         <li>Accessing the deep userdata from your C code, use <tt>luaG_todeep()</tt> instead of the regular <tt>lua_touserdata()</tt>.</li>
 </ol>
@@ -1724,7 +1724,7 @@ int luaD_new_clonable( lua_State* L)
 </p>
 
 <p>
-        <b>NOTE</b>: The lifespan of deep userdata may exceed that of the Lua state that created it. The allocation of the data storage should not be tied to the Lua state used. In other words, use <tt>malloc()</tt>/<tt>free()</tt> or similar memory handling mechanism.
+        <b>NOTE</b>: The lifespan of deep userdata may exceed that of the Lua state that created it. The allocation of the data storage should not be tied to the Lua state used. In other words, use <tt>new</tt>/<tt>delete</tt>, <tt>malloc()</tt>/<tt>free()</tt> or similar memory handling mechanism.
 </p>
 
 
@@ -1812,4 +1812,4 @@ int luaD_new_clonable( lua_State* L)
 </p>
 
 </body>
-</html>
\ No newline at end of file
+</html></pre>
\ No newline at end of file