Merge branch 'master' of https://github.com/LuaLanes/lanes

1 files changed, 139 insertions, 139 deletions

diff --git a/deep_test/deep_test.cpp b/deep_test/deep_test.cpp
index 7c8180f..3467939 100644
--- a/deep_test/deep_test.cpp
+++ b/deep_test/deep_test.cpp
@@ -10,114 +10,114 @@
 // a lanes-deep userdata. needs DeepPrelude and luaG_newdeepuserdata from Lanes code.
 struct MyDeepUserdata : public DeepPrelude // Deep userdata MUST start with a DeepPrelude
 {
-        lua_Integer val{ 0 };
+    lua_Integer val{ 0 };
 };
 
 // ################################################################################################
 
-static void* deep_test_id( lua_State* L, DeepOp op_)
+[[nodiscard]] static void* deep_test_id(lua_State* L, DeepOp op_)
 {
-        switch( op_)
-        {
-                case DeepOp::New:
-                {
-                        MyDeepUserdata* deep_test = new MyDeepUserdata;
-                        return deep_test;
-                }
-
-                case DeepOp::Delete:
-                {
-                        MyDeepUserdata* deep_test = static_cast<MyDeepUserdata*>(lua_touserdata( L, 1));
-                        delete deep_test;
-                        return nullptr;
-                }
-
-                case DeepOp::Metatable:
-                {
-                        luaL_getmetatable( L, "deep");             // mt
-                        return nullptr;
-                }
-
-                case DeepOp::Module:
-                return (void*)"deep_test";
-
-                default:
-                {
-                        return nullptr;
-                }
-        }
+    switch( op_)
+    {
+        case DeepOp::New:
+        {
+            MyDeepUserdata* deep_test = new MyDeepUserdata;
+            return deep_test;
+        }
+
+        case DeepOp::Delete:
+        {
+            MyDeepUserdata* deep_test = static_cast<MyDeepUserdata*>(lua_touserdata( L, 1));
+            delete deep_test;
+            return nullptr;
+        }
+
+        case DeepOp::Metatable:
+        {
+            luaL_getmetatable( L, "deep");             // mt
+            return nullptr;
+        }
+
+        case DeepOp::Module:
+        return (void*)"deep_test";
+
+        default:
+        {
+            return nullptr;
+        }
+    }
 }
 
 // ################################################################################################
 
-static int deep_set( lua_State* L)
+[[nodiscard]] static int deep_set(lua_State* L)
 {
-        MyDeepUserdata* self = static_cast<MyDeepUserdata*>(luaG_todeep(L, deep_test_id, 1));
-        lua_Integer i = lua_tointeger( L, 2);
-        self->val = i;
-        return 0;
+    MyDeepUserdata* self = static_cast<MyDeepUserdata*>(luaG_todeep(L, deep_test_id, 1));
+    lua_Integer i = lua_tointeger( L, 2);
+    self->val = i;
+    return 0;
 }
 
 // ################################################################################################
 
 // won't actually do anything as deep userdata don't have uservalue slots
-static int deep_setuv( lua_State* L)
+[[nodiscard]] static int deep_setuv(lua_State* L)
 {
-        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;
+    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;
 }
 
 // ################################################################################################
 
 // won't actually do anything as deep userdata don't have uservalue slots
-static int deep_getuv( lua_State* L)
+[[nodiscard]] static int deep_getuv(lua_State* L)
 {
-        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;
+    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;
 }
 
 // ################################################################################################
 
-static int deep_tostring( lua_State* L)
+[[nodiscard]] static int deep_tostring(lua_State* L)
 {
-        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;
+    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;
 }
 
 // ################################################################################################
 
-static int deep_gc( lua_State* L)
+[[nodiscard]] static int deep_gc(lua_State* L)
 {
-        MyDeepUserdata* self = static_cast<MyDeepUserdata*>(luaG_todeep(L, deep_test_id, 1));
-        return 0;
+    MyDeepUserdata* self = static_cast<MyDeepUserdata*>(luaG_todeep(L, deep_test_id, 1));
+    return 0;
 }
 
 // ################################################################################################
 
 static luaL_Reg const deep_mt[] =
 {
-        { "__tostring", deep_tostring},
-        { "__gc", deep_gc},
-        { "set", deep_set},
-        { "setuv", deep_setuv},
-        { "getuv", deep_getuv},
-        { nullptr, nullptr }
+    { "__tostring", deep_tostring},
+    { "__gc", deep_gc},
+    { "set", deep_set},
+    { "setuv", deep_setuv},
+    { "getuv", deep_getuv},
+    { nullptr, nullptr }
 };
 
 // ################################################################################################
 
 int luaD_new_deep( lua_State* L)
 {
-        int nuv = (int) luaL_optinteger( L, 1, 0);
-        // no additional parameter to luaG_newdeepuserdata!
-        lua_settop( L, 0);
-        return luaG_newdeepuserdata( L, deep_test_id, nuv);
+    int const nuv{ static_cast<int>(luaL_optinteger(L, 1, 0)) };
+    // no additional parameter to luaG_newdeepuserdata!
+    lua_settop(L, 0);
+    return luaG_newdeepuserdata(Dest{ L }, deep_test_id, nuv);
 }
 
 // ################################################################################################
@@ -125,101 +125,101 @@ int luaD_new_deep( lua_State* L)
 
 struct MyClonableUserdata
 {
-        lua_Integer val;
+    lua_Integer val;
 };
 
 // ################################################################################################
 
-static int clonable_set( lua_State* L)
+[[nodiscard]] static int clonable_set(lua_State* L)
 {
-        MyClonableUserdata* self = static_cast<MyClonableUserdata*>(lua_touserdata(L, 1));
-        lua_Integer i = lua_tointeger(L, 2);
-        self->val = i;
-        return 0;
+    MyClonableUserdata* self = static_cast<MyClonableUserdata*>(lua_touserdata(L, 1));
+    lua_Integer i = lua_tointeger(L, 2);
+    self->val = i;
+    return 0;
 }
 
 // ################################################################################################
 
-static int clonable_setuv( lua_State* L)
+[[nodiscard]] static int clonable_setuv(lua_State* L)
 {
-        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;
+    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;
 }
 
 // ################################################################################################
 
-static int clonable_getuv( lua_State* L)
+[[nodiscard]] static int clonable_getuv(lua_State* L)
 {
-        MyClonableUserdata* self = static_cast<MyClonableUserdata*>(lua_touserdata(L, 1));
-        int uv = (int) luaL_optinteger(L, 2, 1);
-        lua_getiuservalue( L, 1, uv);
-        return 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;
 }
 
 // ################################################################################################
 
-static int clonable_tostring(lua_State* L)
+[[nodiscard]] static int clonable_tostring(lua_State* L)
 {
-        MyClonableUserdata* self = static_cast<MyClonableUserdata*>(lua_touserdata(L, 1));
-        lua_pushfstring(L, "%p:clonable(%d)", lua_topointer(L, 1), self->val);
-        return 1;
+    MyClonableUserdata* self = static_cast<MyClonableUserdata*>(lua_touserdata(L, 1));
+    lua_pushfstring(L, "%p:clonable(%d)", lua_topointer(L, 1), self->val);
+    return 1;
 }
 
 // ################################################################################################
 
-static int clonable_gc( lua_State* L)
+[[nodiscard]] static int clonable_gc(lua_State* L)
 {
-        MyClonableUserdata* self = static_cast<MyClonableUserdata*>(lua_touserdata(L, 1));
-        return 0;
+    MyClonableUserdata* self = static_cast<MyClonableUserdata*>(lua_touserdata(L, 1));
+    return 0;
 }
 
 // ################################################################################################
 
 // this is all we need to make a userdata lanes-clonable. no dependency on Lanes code.
-static int clonable_lanesclone( lua_State* L)
+[[nodiscard]] static int clonable_lanesclone(lua_State* L)
 {
-        switch( lua_gettop( L))
-        {
-                case 3:
-                {
-                        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(MyClonableUserdata));
-                        *self = *from;
-                }
-                return 0;
-
-                default:
-                (void) luaL_error( L, "Lanes called clonable_lanesclone with unexpected parameters");
-        }
-        return 0;
+    switch( lua_gettop( L))
+    {
+        case 3:
+        {
+            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(MyClonableUserdata));
+            *self = *from;
+        }
+        return 0;
+
+        default:
+        (void) luaL_error( L, "Lanes called clonable_lanesclone with unexpected parameters");
+    }
+    return 0;
 }
 
 // ################################################################################################
 
 static luaL_Reg const clonable_mt[] =
 {
-        { "__tostring", clonable_tostring},
-        { "__gc", clonable_gc},
-        { "__lanesclone", clonable_lanesclone},
-        { "set", clonable_set},
-        { "setuv", clonable_setuv},
-        { "getuv", clonable_getuv},
-        { nullptr, nullptr }
+    { "__tostring", clonable_tostring},
+    { "__gc", clonable_gc},
+    { "__lanesclone", clonable_lanesclone},
+    { "set", clonable_set},
+    { "setuv", clonable_setuv},
+    { "getuv", clonable_getuv},
+    { nullptr, nullptr }
 };
 
 // ################################################################################################
 
 int luaD_new_clonable( lua_State* L)
 {
-        int nuv = (int) luaL_optinteger( L, 1, 1);
-        lua_newuserdatauv( L, sizeof(MyClonableUserdata), nuv);
-        luaL_setmetatable( L, "clonable");
-        return 1;
+    int const nuv{ static_cast<int>(luaL_optinteger(L, 1, 1)) };
+    lua_newuserdatauv( L, sizeof(MyClonableUserdata), nuv);
+    luaL_setmetatable( L, "clonable");
+    return 1;
 }
 
 // ################################################################################################
@@ -227,33 +227,33 @@ int luaD_new_clonable( lua_State* L)
 
 static luaL_Reg const deep_module[] =
 {
-        { "new_deep", luaD_new_deep},
-        { "new_clonable", luaD_new_clonable},
-        { nullptr, nullptr }
+    { "new_deep", luaD_new_deep},
+    { "new_clonable", luaD_new_clonable},
+    { nullptr, nullptr }
 };
 
 // ################################################################################################
 
 LANES_API int luaopen_deep_test(lua_State* L)
 {
-        luaL_newlib( L, deep_module);                           // M
-
-        // preregister the metatables for the types we can instantiate so that Lanes can know about them
-        if( luaL_newmetatable( L, "clonable"))                  // M mt
-        {
-                luaL_setfuncs( L, clonable_mt, 0);
-                lua_pushvalue(L, -1);                               // M mt mt
-                lua_setfield(L, -2, "__index");                     // M mt
-        }
-        lua_setfield(L, -2, "__clonableMT");                    // M
-
-        if( luaL_newmetatable( L, "deep"))                      // mt
-        {
-                luaL_setfuncs( L, deep_mt, 0);
-                lua_pushvalue(L, -1);                               // mt mt
-                lua_setfield(L, -2, "__index");                     // mt
-        }
-        lua_setfield(L, -2, "__deepMT");                        // M
-
-        return 1;
+    luaL_newlib( L, deep_module);                           // M
+
+    // preregister the metatables for the types we can instantiate so that Lanes can know about them
+    if( luaL_newmetatable( L, "clonable"))                  // M mt
+    {
+        luaL_setfuncs( L, clonable_mt, 0);
+        lua_pushvalue(L, -1);                               // M mt mt
+        lua_setfield(L, -2, "__index");                     // M mt
+    }
+    lua_setfield(L, -2, "__clonableMT");                    // M
+
+    if( luaL_newmetatable( L, "deep"))                      // mt
+    {
+        luaL_setfuncs( L, deep_mt, 0);
+        lua_pushvalue(L, -1);                               // mt mt
+        lua_setfield(L, -2, "__index");                     // mt
+    }
+    lua_setfield(L, -2, "__deepMT");                        // M
+
+    return 1;
 }