Removed .demote_full_userdata

4 files changed, 4 insertions, 23 deletions

diff --git a/src/intercopycontext.cpp b/src/intercopycontext.cpp
index a5fd400..5be4304 100644
--- a/src/intercopycontext.cpp
+++ b/src/intercopycontext.cpp
@@ -718,6 +718,8 @@ LuaType InterCopyContext::processConversion() const
         return false;
     }
 
+    DEBUGSPEW_CODE(DebugSpew(U) << "CLONABLE USERDATA" << std::endl);
+
     // we need to copy over the uservalues of the userdata as well
     {
         int const _mt{ luaG_absindex(L1, -2) };                                                    // L1: ... mt __lanesclone
@@ -795,6 +797,7 @@ LuaType InterCopyContext::processConversion() const
         return false; // not a deep userdata
     }
 
+    DEBUGSPEW_CODE(DebugSpew(U) << "DEEP USERDATA" << std::endl);
     STACK_CHECK_START_REL(L1, 0);
     STACK_CHECK_START_REL(L2, 0);
 
@@ -1085,27 +1088,13 @@ LuaType InterCopyContext::processConversion() const
     STACK_CHECK(L2, 0);
 
     // Allow only deep userdata entities to be copied across
-    DEBUGSPEW_CODE(DebugSpew(nullptr) << "USERDATA" << std::endl);
     if (tryCopyDeep()) {
         STACK_CHECK(L1, 0);
         STACK_CHECK(L2, 1);
         return true;
     }
 
-    STACK_CHECK(L1, 0);
-    STACK_CHECK(L2, 0);
-
-    // Not a deep or clonable full userdata
-    if (U->demoteFullUserdata) { // attempt demotion to light userdata
-        void* const _lud{ lua_touserdata(L1, L1_i) };
-        lua_pushlightuserdata(L2, _lud);
-    } else { // raise an error
-        raise_luaL_error(getErrL(), "can't copy non-deep full userdata across lanes");
-    }
-
-    STACK_CHECK(L2, 1);
-    STACK_CHECK(L1, 0);
-    return true;
+    raise_luaL_error(getErrL(), "can't copy non-deep full userdata across lanes");
 }
 
 // #################################################################################################
diff --git a/src/lanes.lua b/src/lanes.lua
index 92e773a..1378412 100644
--- a/src/lanes.lua
+++ b/src/lanes.lua
@@ -92,7 +92,6 @@ local default_params =
 {
     -- LuaJIT provides a thread-unsafe allocator by default, so we need to protect it when used in parallel lanes
     allocator = isLuaJIT and "protected" or nil,
-    demote_full_userdata = nil,
     -- it looks also like LuaJIT allocator may not appreciate direct use of its allocator for other purposes than the VM operation
     internal_allocator = isLuaJIT and "libc" or "allocator",
     keepers_gc_threshold = -1,
@@ -119,7 +118,6 @@ local param_checkers =
         -- can be nil, "protected", or a function
         return val_ and (type(val_) == "function" or val_ == "protected") or true
     end,
-    demote_full_userdata = boolean_param_checker,
     internal_allocator = function(val_)
         -- can be "libc" or "allocator"
         return val_ == "libc" or val_ == "allocator"
diff --git a/src/universe.cpp b/src/universe.cpp
index 9ab6019..82522f1 100644
--- a/src/universe.cpp
+++ b/src/universe.cpp
@@ -107,7 +107,6 @@ Universe::Universe()
     lua_setmetatable(L_, -2);                                                                      // L_: settings universe
     lua_pop(L_, 1);                                                                                // L_: settings
 
-    // TODO: write some tests to see what happens when we trigger errors in stripped mode
     std::ignore = luaG_getfield(L_, 1, "strip_functions");                                         // L_: settings strip_functions
     _U->stripFunctions = lua_toboolean(L_, -1) ? true : false;
     lua_pop(L_, 1);                                                                                // L_: settings
@@ -115,9 +114,6 @@ Universe::Universe()
     std::ignore = luaG_getfield(L_, 1, "verbose_errors");                                          // L_: settings verbose_errors
     _U->verboseErrors = lua_toboolean(L_, -1) ? true : false;
     lua_pop(L_, 1);                                                                                // L_: settings
-    std::ignore = luaG_getfield(L_, 1, "demote_full_userdata");                                    // L_: settings demote_full_userdata
-    _U->demoteFullUserdata = lua_toboolean(L_, -1) ? true : false;
-    lua_pop(L_, 1);                                                                                // L_: settings
 
     // tracking
     std::ignore = luaG_getfield(L_, 1, "track_lanes");                                             // L_: settings track_lanes
diff --git a/src/universe.h b/src/universe.h
index 2b8cdf2..f0975d8 100644
--- a/src/universe.h
+++ b/src/universe.h
@@ -128,8 +128,6 @@ class Universe
     // for verbose errors
     bool verboseErrors{ false };
 
-    bool demoteFullUserdata{ false };
-
     bool stripFunctions{ true };
 
     // before a state is created, this function will be called to obtain the allocator