StarMirror/sol2
1
0
Fork 0
mirror of https://github.com/ThePhD/sol2.git synced 2024-03-22 13:10:44 +08:00
Code Issues Projects Releases Wiki Activity

Improve container handling and the vec[#vec] = nil idiom from Lua

Browse Source
This commit is contained in:
ThePhD 2020-05-06 22:17:02 -04:00
parent 890cdd38b4
commit 5022c4d8f6
No known key found for this signature in database
GPG Key ID: 1509DB1C0F702BFA
5 changed files with 60 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/sol/error_handler.hpp
View File

@ -34,9 +34,9 @@ namespace sol {
namespace detail { namespace detail {
constexpr const char* not_a_number = "not a numeric type"; constexpr const char* not_a_number = "not a numeric type";
constexpr const char* not_a_number_or_number_string = "not a numeric type or numeric string"; constexpr const char* not_a_number_or_number_string = "not a numeric type or numeric string";
constexpr const char* not_a_number_integral = "not a numeric type that fits exactly an integer (has significant decimals)"; constexpr const char* not_a_number_integral = "not a numeric type that fits exactly an integer (number maybe has significant decimals)";
constexpr const char* not_a_number_or_number_string_integral constexpr const char* not_a_number_or_number_string_integral
= "not a numeric type or a numeric string that fits exactly an integer (has significant decimals)"; = "not a numeric type or a numeric string that fits exactly an integer (e.g. number maybe has significant decimals)";
constexpr const char* not_enough_stack_space = "not enough space left on Lua stack"; constexpr const char* not_enough_stack_space = "not enough space left on Lua stack";
constexpr const char* not_enough_stack_space_floating = "not enough space left on Lua stack for a floating point number"; constexpr const char* not_enough_stack_space_floating = "not enough space left on Lua stack for a floating point number";
@ -138,7 +138,7 @@ namespace sol {
aux_message += detail::demangle<R>(); aux_message += detail::demangle<R>();
aux_message += "("; aux_message += "(";
int marker = 0; int marker = 0;
(void)detail::swallow{ int(), (detail::accumulate_and_mark(detail::demangle<Args>(), aux_message, marker), int())... }; (void)detail::swallow { int(), (detail::accumulate_and_mark(detail::demangle<Args>(), aux_message, marker), int())... };
aux_message += ")')"; aux_message += ")')";
push_type_panic_string(L, index, expected, actual, message, aux_message); push_type_panic_string(L, index, expected, actual, message, aux_message);
} }

25
include/sol/usertype_container.hpp
View File

@ -356,10 +356,10 @@ namespace sol {
using has_traits_erase = meta::boolean<has_traits_erase_test<T>::value>; using has_traits_erase = meta::boolean<has_traits_erase_test<T>::value>;
template <typename T> template <typename T>
struct is_forced_container : is_container<T> {}; struct is_forced_container : is_container<T> { };
template <typename T> template <typename T>
struct is_forced_container<as_container_t<T>> : std::true_type {}; struct is_forced_container<as_container_t<T>> : std::true_type { };
template <typename T> template <typename T>
struct container_decay { struct container_decay {
@ -880,8 +880,7 @@ namespace sol {
auto backit = self.before_begin(); auto backit = self.before_begin();
{ {
auto e = deferred_uc::end(L, self); auto e = deferred_uc::end(L, self);
for (auto it = deferred_uc::begin(L, self); it != e; ++backit, ++it) { for (auto it = deferred_uc::begin(L, self); it != e; ++backit, ++it) { }
}
} }
return add_insert_after(std::true_type(), L, self, value, backit); return add_insert_after(std::true_type(), L, self, value, backit);
} }
@ -1244,9 +1243,23 @@ namespace sol {
static int set(lua_State* L) { static int set(lua_State* L) {
stack_object value = stack_object(L, raw_index(3)); stack_object value = stack_object(L, raw_index(3));
if constexpr (is_linear_integral::value) {
// for non-associative containers,
// erasure only happens if it is the
// last index in the container
auto key = stack::get<K>(L, 2);
auto self_size = deferred_uc::size(L);
if (key == static_cast<K>(self_size)) {
if (type_of(L, 3) == type::lua_nil) { if (type_of(L, 3) == type::lua_nil) {
return erase(L); return erase(L);
} }
}
}
else {
if (type_of(L, 3) == type::lua_nil) {
return erase(L);
}
}
auto& self = get_src(L); auto& self = get_src(L);
detail::error_result er = set_start(L, self, stack_object(L, raw_index(2)), std::move(value)); detail::error_result er = set_start(L, self, stack_object(L, raw_index(2)), std::move(value));
return handle_errors(L, er); return handle_errors(L, er);
@ -1522,11 +1535,11 @@ namespace sol {
}; };
template <typename X> template <typename X>
struct usertype_container_default<usertype_container<X>> : usertype_container_default<X> {}; struct usertype_container_default<usertype_container<X>> : usertype_container_default<X> { };
} // namespace container_detail } // namespace container_detail
template <typename T> template <typename T>
struct usertype_container : container_detail::usertype_container_default<T> {}; struct usertype_container : container_detail::usertype_container_default<T> { };
} // namespace sol } // namespace sol

4
single/include/sol/forward.hpp
View File

@ -20,8 +20,8 @@
// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// This file was generated with a script. // This file was generated with a script.
// Generated 2020-03-31 04:18:52.546413 UTC // Generated 2020-05-07 02:16:42.603409 UTC
// This header was generated with sol v3.2.0 (revision 82812c5) // This header was generated with sol v3.2.0 (revision 890cdd3)
// https://github.com/ThePhD/sol2 // https://github.com/ThePhD/sol2
#ifndef SOL_SINGLE_INCLUDE_FORWARD_HPP #ifndef SOL_SINGLE_INCLUDE_FORWARD_HPP

35
single/include/sol/sol.hpp
View File

@ -20,8 +20,8 @@
// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// This file was generated with a script. // This file was generated with a script.
// Generated 2020-03-31 04:18:51.740568 UTC // Generated 2020-05-07 02:16:42.137643 UTC
// This header was generated with sol v3.2.0 (revision 82812c5) // This header was generated with sol v3.2.0 (revision 890cdd3)
// https://github.com/ThePhD/sol2 // https://github.com/ThePhD/sol2
#ifndef SOL_SINGLE_INCLUDE_HPP #ifndef SOL_SINGLE_INCLUDE_HPP
@ -8054,9 +8054,9 @@ namespace sol {
namespace detail { namespace detail {
constexpr const char* not_a_number = "not a numeric type"; constexpr const char* not_a_number = "not a numeric type";
constexpr const char* not_a_number_or_number_string = "not a numeric type or numeric string"; constexpr const char* not_a_number_or_number_string = "not a numeric type or numeric string";
constexpr const char* not_a_number_integral = "not a numeric type that fits exactly an integer (has significant decimals)"; constexpr const char* not_a_number_integral = "not a numeric type that fits exactly an integer (number maybe has significant decimals)";
constexpr const char* not_a_number_or_number_string_integral constexpr const char* not_a_number_or_number_string_integral
= "not a numeric type or a numeric string that fits exactly an integer (has significant decimals)"; = "not a numeric type or a numeric string that fits exactly an integer (e.g. number maybe has significant decimals)";
constexpr const char* not_enough_stack_space = "not enough space left on Lua stack"; constexpr const char* not_enough_stack_space = "not enough space left on Lua stack";
constexpr const char* not_enough_stack_space_floating = "not enough space left on Lua stack for a floating point number"; constexpr const char* not_enough_stack_space_floating = "not enough space left on Lua stack for a floating point number";
@ -8158,7 +8158,7 @@ namespace sol {
aux_message += detail::demangle<R>(); aux_message += detail::demangle<R>();
aux_message += "("; aux_message += "(";
int marker = 0; int marker = 0;
(void)detail::swallow{ int(), (detail::accumulate_and_mark(detail::demangle<Args>(), aux_message, marker), int())... }; (void)detail::swallow { int(), (detail::accumulate_and_mark(detail::demangle<Args>(), aux_message, marker), int())... };
aux_message += ")')"; aux_message += ")')";
push_type_panic_string(L, index, expected, actual, message, aux_message); push_type_panic_string(L, index, expected, actual, message, aux_message);
} }
@ -19231,10 +19231,10 @@ namespace sol {
using has_traits_erase = meta::boolean<has_traits_erase_test<T>::value>; using has_traits_erase = meta::boolean<has_traits_erase_test<T>::value>;
template <typename T> template <typename T>
struct is_forced_container : is_container<T> {}; struct is_forced_container : is_container<T> { };
template <typename T> template <typename T>
struct is_forced_container<as_container_t<T>> : std::true_type {}; struct is_forced_container<as_container_t<T>> : std::true_type { };
template <typename T> template <typename T>
struct container_decay { struct container_decay {
@ -19755,8 +19755,7 @@ namespace sol {
auto backit = self.before_begin(); auto backit = self.before_begin();
{ {
auto e = deferred_uc::end(L, self); auto e = deferred_uc::end(L, self);
for (auto it = deferred_uc::begin(L, self); it != e; ++backit, ++it) { for (auto it = deferred_uc::begin(L, self); it != e; ++backit, ++it) { }
}
} }
return add_insert_after(std::true_type(), L, self, value, backit); return add_insert_after(std::true_type(), L, self, value, backit);
} }
@ -20119,9 +20118,23 @@ namespace sol {
static int set(lua_State* L) { static int set(lua_State* L) {
stack_object value = stack_object(L, raw_index(3)); stack_object value = stack_object(L, raw_index(3));
if constexpr (is_linear_integral::value) {
// for non-associative containers,
// erasure only happens if it is the
// last index in the container
auto key = stack::get<K>(L, 2);
auto self_size = deferred_uc::size(L);
if (key == static_cast<K>(self_size)) {
if (type_of(L, 3) == type::lua_nil) { if (type_of(L, 3) == type::lua_nil) {
return erase(L); return erase(L);
} }
}
}
else {
if (type_of(L, 3) == type::lua_nil) {
return erase(L);
}
}
auto& self = get_src(L); auto& self = get_src(L);
detail::error_result er = set_start(L, self, stack_object(L, raw_index(2)), std::move(value)); detail::error_result er = set_start(L, self, stack_object(L, raw_index(2)), std::move(value));
return handle_errors(L, er); return handle_errors(L, er);
@ -20397,11 +20410,11 @@ namespace sol {
}; };
template <typename X> template <typename X>
struct usertype_container_default<usertype_container<X>> : usertype_container_default<X> {}; struct usertype_container_default<usertype_container<X>> : usertype_container_default<X> { };
} // namespace container_detail } // namespace container_detail
template <typename T> template <typename T>
struct usertype_container : container_detail::usertype_container_default<T> {}; struct usertype_container : container_detail::usertype_container_default<T> { };
} // namespace sol } // namespace sol

10
tests/runtime_tests/source/container_shims.cpp
View File

@ -139,7 +139,7 @@ struct my_vec : public std::vector<int> {
namespace sol { namespace sol {
template <> template <>
struct is_container<my_vec> : std::true_type {}; struct is_container<my_vec> : std::true_type { };
template <> template <>
struct usertype_container<my_vec> { struct usertype_container<my_vec> {
@ -149,6 +149,12 @@ namespace sol {
static auto end(lua_State*, my_vec& self) { static auto end(lua_State*, my_vec& self) {
return self.end(); return self.end();
} }
static std::size_t size(lua_State* L) {
my_vec& v = sol::stack::get<my_vec&>(L, 1);
return v.size();
}
static std::ptrdiff_t index_adjustment(lua_State*, my_vec&) { static std::ptrdiff_t index_adjustment(lua_State*, my_vec&) {
return 0; return 0;
} }
@ -202,7 +208,7 @@ TEST_CASE("containers/custom indexing", "allow containers to set a custom indexi
sol::state lua; sol::state lua;
lua.open_libraries(sol::lib::base); lua.open_libraries(sol::lib::base);
lua["c"] = my_vec{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; lua["c"] = my_vec { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
auto result1 = lua.safe_script("for i=0,9 do assert(i == c[i]) end", sol::script_pass_on_error); auto result1 = lua.safe_script("for i=0,9 do assert(i == c[i]) end", sol::script_pass_on_error);
REQUIRE(result1.valid()); REQUIRE(result1.valid());