Skip to content

Better utilize existing Lua 5.3 compatibility layer #1677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Better utilize existing Lua 5.3 compatibility layer #1677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/sol/reference.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,9 @@ namespace sol {
#if SOL_LUA_VERSION_I_ < 502
if (L_ == nullptr)
return backup_if_unsupported_;
lua_getglobal(L_, detail::default_main_thread_name());
type t = static_cast<type>(lua_getglobal(L_, detail::default_main_thread_name()));
auto pp = stack::pop_n(L_, 1);
if (type_of(L_, -1) == type::thread) {
if (t == type::thread) {
return lua_tothread(L_, -1);
}
return backup_if_unsupported_;
Expand Down
7 changes: 3 additions & 4 deletions include/sol/stack_check_unqualified.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,8 +545,8 @@ namespace sol { namespace stack {
#endif // make sure stack doesn't overflow
auto pn = stack::pop_n(L_, 1);
lua_pushstring(L_, &detail::base_class_check_key()[0]);
lua_rawget(L_, metatableindex);
if (type_of(L_, -1) != type::lua_nil) {
type t = static_cast<type>(lua_rawget(L_, metatableindex));
if (t != type::lua_nil) {
void* basecastdata = lua_touserdata(L_, -1);
detail::inheritance_check_function ic = reinterpret_cast<detail::inheritance_check_function>(basecastdata);
success = ic(usertype_traits<T>::qualified_name());
Expand Down Expand Up @@ -627,8 +627,7 @@ namespace sol { namespace stack {
bool isnil = false;
for (; vi < static_cast<int>(lua_size<V>::value); ++vi) {
lua_pushinteger(arg_L, i);
lua_gettable(arg_L, static_cast<int>(index));
type vt = type_of(arg_L, -1);
type vt = static_cast<type>(lua_gettable(arg_L, static_cast<int>(index)));
isnil = vt == type::lua_nil;
if (isnil) {
if (i == 0) {
Expand Down
10 changes: 4 additions & 6 deletions include/sol/stack_get_unqualified.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,8 +407,7 @@ namespace sol { namespace stack {
bool isnil = false;
for (int vi = 0; vi < lua_size<V>::value; ++vi) {
lua_pushinteger(L, i);
lua_gettable(L, index);
type vt = type_of(L, -1);
type vt = static_cast<type>(lua_gettable(L, index));
isnil = vt == type::lua_nil;
if (isnil) {
if (i == 0) {
Expand Down Expand Up @@ -523,8 +522,7 @@ namespace sol { namespace stack {
bool isnil = false;
for (int vi = 0; vi < lua_size<V>::value; ++vi) {
lua_pushinteger(L, i);
lua_gettable(L, index);
type t = type_of(L, -1);
type t = static_cast<type>(lua_gettable(L, index));
isnil = t == type::lua_nil;
if (isnil) {
if (i == 0) {
Expand Down Expand Up @@ -905,8 +903,8 @@ namespace sol { namespace stack {
bool has_derived = derive<T>::value || weak_derive<T>::value;
if (has_derived) {
if (lua_getmetatable(L, index) == 1) {
lua_getfield(L, -1, &detail::base_class_cast_key()[0]);
if (type_of(L, -1) != type::lua_nil) {
type t = static_cast<type>(lua_getfield(L, -1, &detail::base_class_cast_key()[0]));
if (t != type::lua_nil) {
void* basecastdata = lua_touserdata(L, -1);
detail::inheritance_cast_function ic = reinterpret_cast<detail::inheritance_cast_function>(basecastdata);
// use the casting function to properly adjust the pointer for the desired T
Expand Down
4 changes: 2 additions & 2 deletions include/sol/stack_push.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,7 @@ namespace sol { namespace stack {
#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
#endif // make sure stack doesn't overflow
lua_pushlstring(L, str, std::char_traits<char>::length(str));
lua_pushlstring(L, str, N - 1);
return 1;
}

Expand Down Expand Up @@ -875,7 +875,7 @@ namespace sol { namespace stack {
luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
#endif // make sure stack doesn't overflow
const char* str_as_char = reinterpret_cast<const char*>(static_cast<const char8_t*>(str));
lua_pushlstring(L, str_as_char, std::char_traits<char>::length(str_as_char));
lua_pushlstring(L, str_as_char, N - 1);
return 1;
}

Expand Down