From 0027ce6c847ce10d33c586aebaf3ac4305bd1099 Mon Sep 17 00:00:00 2001 From: ThePhD Date: Sun, 24 Sep 2017 16:04:10 -0400 Subject: [PATCH] make sure default `userdata_getter` does not error everything horribly update single --- examples/interop/Player.h | 20 +++++++++ examples/interop/Player.pkg | 8 ++++ examples/interop/tolua.cpp | 87 +++++++++++++++++++++++++++++++++++++ single/sol/sol.hpp | 19 ++++++-- sol/stack_core.hpp | 9 ++++ sol/stack_get.hpp | 6 ++- 6 files changed, 143 insertions(+), 6 deletions(-) create mode 100644 examples/interop/Player.h create mode 100644 examples/interop/Player.pkg create mode 100644 examples/interop/tolua.cpp diff --git a/examples/interop/Player.h b/examples/interop/Player.h new file mode 100644 index 00000000..51c36afe --- /dev/null +++ b/examples/interop/Player.h @@ -0,0 +1,20 @@ +#ifndef PLAYER_H +#define PLAYER_H + +class Player { +private: + int m_health; + +public: + Player() + : m_health(0) { + } + void setHealth(int health) { + m_health - health; + } + int getHealth() const { + return m_health; + } +}; + +#endif // PLAYER_H diff --git a/examples/interop/Player.pkg b/examples/interop/Player.pkg new file mode 100644 index 00000000..e6c3fabf --- /dev/null +++ b/examples/interop/Player.pkg @@ -0,0 +1,8 @@ +$#include "Player.h" + +class Player { + Player(); + ~Player(); + void setHealth(int _health); + int getHealth(); +}; diff --git a/examples/interop/tolua.cpp b/examples/interop/tolua.cpp new file mode 100644 index 00000000..1d86bd0a --- /dev/null +++ b/examples/interop/tolua.cpp @@ -0,0 +1,87 @@ +#define SOL_CHECK_ARGUMENTS 1 +#define SOL_ENABLE_INTEROP 1 // MUST be defined to use interop features +#include + +#include "Player.h" +// pick or replace the includes +// with whatever generated file you've created +#include +#include "tolua_Player.h" + +#include +#include + +// tolua code lifted from some blog, if the link dies +// I don't know where else you're gonna find the reference, +// http://usefulgamedev.weebly.com/tolua-example.html + +namespace sol { +namespace stack { + template + struct userdata_checker> { + template + static bool check( + lua_State* L, int relindex, type index_type, Handler&& handler, record& tracking) { + // just marking unused parameters for no compiler warnings + (void)index_type; + (void)handler; + int index = lua_absindex(L, relindex); + std::string name = sol::detail::short_demangle(); + tolua_Error tolua_err; + return tolua_isusertype(L, index, name.c_str(), 0, &tolua_err); + } + }; +} +} // namespace sol::stack + +void register_sol_stuff(lua_State* L) { + // grab raw state and put into state_view + // state_view is cheap to construct + sol::state_view lua(L); + // bind and set up your things: everything is entirely self-contained + lua["f"] = sol::overload( + [](Player& from_tolua) { + std::cout << "calling 1-argument version with tolua-created Player { health:" << from_tolua.getHealth() << "}" << std::endl; + }, + [](Player& from_tolua, int second_arg) { + std::cout << "calling 2-argument version with tolua-created Player { health: " << from_tolua.getHealth() << "} and integer argument of " << second_arg << std::endl; + }); +} + +void check_with_sol(lua_State* L) { + sol::state_view lua(L); + Player& obj = lua["obj"]; + (void)obj; + assert(obj.getHealth() == 4); +} + +int main(int, char* []) { + + std::cout << "=== interop example (tolua) ===" << std::endl; + std::cout << "(code lifted from a sol2 user's use case: https://github.com/ThePhD/sol2/issues/511#issuecomment-331729884)" << std::endl; + + lua_State* L = luaL_newstate(); + + luaL_openlibs(L); // initalize all lua standard library functions + tolua_open(L); // initalize tolua + tolua_Player_open(L); // make Player class accessible from LUA + + + register_sol_stuff(L); + + const auto code = R"( +obj = Player:new() +obj:setHealth(4) + +f(obj) -- call 1 argument version +f(obj, 5) -- call 2 argument version +)"; + + if (luaL_dostring(L, code)) { + lua_error(L); // crash on error + } + + check_with_sol(L); + + return 0; +} \ No newline at end of file diff --git a/single/sol/sol.hpp b/single/sol/sol.hpp index 07691701..07f64c99 100644 --- a/single/sol/sol.hpp +++ b/single/sol/sol.hpp @@ -20,8 +20,8 @@ // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // This file was generated with a script. -// Generated 2017-09-24 00:26:27.067649 UTC -// This header was generated with sol v2.18.3 (revision 6d879f5) +// Generated 2017-09-24 20:03:42.743518 UTC +// This header was generated with sol v2.18.3 (revision 0c20d06) // https://github.com/ThePhD/sol2 #ifndef SOL_SINGLE_INCLUDE_HPP @@ -6623,6 +6623,15 @@ namespace sol { template using strip_t = typename strip::type; + template + struct strip_extensible { typedef T type; }; + + template + struct strip_extensible> { typedef T type; }; + + template + using strip_extensible_t = typename strip_extensible::type; + const bool default_check_arguments = #ifdef SOL_CHECK_ARGUMENTS true; @@ -7640,8 +7649,10 @@ namespace sol { namespace sol { namespace stack { - template - struct userdata_getter { + template + struct userdata_getter { + typedef stack_detail::strip_extensible_t T; + static std::pair get(lua_State*, int, void*, record&) { return { false, nullptr }; } diff --git a/sol/stack_core.hpp b/sol/stack_core.hpp index 04f8804f..cb0c6d7b 100644 --- a/sol/stack_core.hpp +++ b/sol/stack_core.hpp @@ -179,6 +179,15 @@ namespace sol { template using strip_t = typename strip::type; + template + struct strip_extensible { typedef T type; }; + + template + struct strip_extensible> { typedef T type; }; + + template + using strip_extensible_t = typename strip_extensible::type; + const bool default_check_arguments = #ifdef SOL_CHECK_ARGUMENTS true; diff --git a/sol/stack_get.hpp b/sol/stack_get.hpp index b36344c9..412dc808 100644 --- a/sol/stack_get.hpp +++ b/sol/stack_get.hpp @@ -44,8 +44,10 @@ namespace sol { namespace stack { - template - struct userdata_getter { + template + struct userdata_getter { + typedef stack_detail::strip_extensible_t T; + static std::pair get(lua_State*, int, void*, record&) { return { false, nullptr }; }