From c467671ae8b6ec161c17e86f3383fd0625f755b8 Mon Sep 17 00:00:00 2001 From: Clyne Sullivan Date: Fri, 19 Aug 2022 19:48:10 -0400 Subject: remove sol2 (will re-add as submodule) --- lib/sol2/examples/interop/tolua/CMakeLists.txt | 68 ------- lib/sol2/examples/interop/tolua/source/Player.h | 20 -- lib/sol2/examples/interop/tolua/source/Player.pkg | 8 - lib/sol2/examples/interop/tolua/source/tolua.cpp | 97 --------- .../examples/interop/tolua/source/tolua_Player.h | 217 --------------------- 5 files changed, 410 deletions(-) delete mode 100644 lib/sol2/examples/interop/tolua/CMakeLists.txt delete mode 100644 lib/sol2/examples/interop/tolua/source/Player.h delete mode 100644 lib/sol2/examples/interop/tolua/source/Player.pkg delete mode 100644 lib/sol2/examples/interop/tolua/source/tolua.cpp delete mode 100644 lib/sol2/examples/interop/tolua/source/tolua_Player.h (limited to 'lib/sol2/examples/interop/tolua') diff --git a/lib/sol2/examples/interop/tolua/CMakeLists.txt b/lib/sol2/examples/interop/tolua/CMakeLists.txt deleted file mode 100644 index 75f94cc..0000000 --- a/lib/sol2/examples/interop/tolua/CMakeLists.txt +++ /dev/null @@ -1,68 +0,0 @@ -# # # # sol3 -# The MIT License (MIT) -# -# Copyright (c) 2013-2019 Rapptz, ThePhD, and contributors -# -# Permission is hereby granted, free of charge, to any person obtaining a copy of -# this software and associated documentation files (the "Software"), to deal in -# the Software without restriction, including without limitation the rights to -# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -# the Software, and to permit persons to whom the Software is furnished to do so, -# subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -# # # sol3 interop Examples - tolua - -find_package(ToLuappBuild REQUIRED) - -function(make_tolua_interop_example target_library example_suffix) - set(example_name tolua_interop_example) - set(example_name "${example_name}${example_suffix}") - - add_executable(${example_name} source/tolua.cpp) - target_link_libraries(${example_name} - PRIVATE sol2::assert - ${LUA_LIBRARIES} ${TOLUAPP_LIBRARIES} ${target_library}) - - if (MSVC) - target_compile_options(${example_name} - PRIVATE /std:c++latest /EHsc "$<$:/MDd>" - "$<$:/MD>" - "$<$:/MD>" - "$<$:/MD>") - target_compile_definitions(${example_name} - PRIVATE /W1 UNICODE _UNICODE - _CRT_SECURE_NO_WARNINGS _CRT_SECURE_NO_DEPRECATE) - else() - target_compile_options(${example_name} - PRIVATE -std=c++1z -w - -Wno-unknown-warning -Wno-unknown-warning-option) - endif() - - if (CMAKE_DL_LIBS) - target_link_libraries(${example_name} PRIVATE ${CMAKE_DL_LIBS}) - endif() - - if (SOL2_TESTS_INTEROP_EXAMPLES) - add_test(NAME ${example_name} COMMAND ${example_name}) - endif() -endfunction() - -if (SOL2_INTEROP_EXAMPLES) - make_tolua_interop_example(sol2::sol2 "") -endif() -if (SOL2_INTEROP_EXAMPLES_SINGLE) - make_tolua_interop_example(sol2::sol2_single ".single") -endif() -if (SOL2_INTEROP_EXAMPLES_SINGLE_GENERATED) - make_tolua_interop_example(sol2::sol2_single_generated ".single.generated") -endif() diff --git a/lib/sol2/examples/interop/tolua/source/Player.h b/lib/sol2/examples/interop/tolua/source/Player.h deleted file mode 100644 index 7d8148c..0000000 --- a/lib/sol2/examples/interop/tolua/source/Player.h +++ /dev/null @@ -1,20 +0,0 @@ -#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/lib/sol2/examples/interop/tolua/source/Player.pkg b/lib/sol2/examples/interop/tolua/source/Player.pkg deleted file mode 100644 index e6c3fab..0000000 --- a/lib/sol2/examples/interop/tolua/source/Player.pkg +++ /dev/null @@ -1,8 +0,0 @@ -$#include "Player.h" - -class Player { - Player(); - ~Player(); - void setHealth(int _health); - int getHealth(); -}; diff --git a/lib/sol2/examples/interop/tolua/source/tolua.cpp b/lib/sol2/examples/interop/tolua/source/tolua.cpp deleted file mode 100644 index d413e27..0000000 --- a/lib/sol2/examples/interop/tolua/source/tolua.cpp +++ /dev/null @@ -1,97 +0,0 @@ -#define SOL_ALL_SAFETIES_ON 1 -#define SOL_ENABLE_INTEROP 1 // MUST be defined to use interop features -#include - -#include "Player.h" -#include -// pick or replace the include -// with whatever generated file you've created -#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 - - -/* NOTE: there is no sol_lua_interop_get here, - because tolua types are -- thankfully -- memory-compatible - in most cases with sol. - Please check other examples like kaguya or LuaBribe for an example - of how to also write the getter for your type*/ -template -inline bool sol_lua_interop_check(sol::types, lua_State* L, int relindex, sol::type index_type, Handler&& handler, sol::stack::record& tracking) { - tracking.use(1); - // 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{}; - int r = tolua_isusertype(L, index, name.c_str(), 0, &tolua_err); - if (r == 0) { - // tolua seems to leave garbage on the stack - // when the check fails - // thanks, tolua - lua_pop(L, 2); - return false; - } - return true; -} - -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; - c_assert(from_tolua.getHealth() == 4); - }, - [](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; - c_assert(from_tolua.getHealth() == 4); - c_assert(second_arg == 5); - }); -} - -void check_with_sol(lua_State* L) { - sol::state_view lua(L); - Player& obj = lua["obj"]; - (void)obj; - c_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/lib/sol2/examples/interop/tolua/source/tolua_Player.h b/lib/sol2/examples/interop/tolua/source/tolua_Player.h deleted file mode 100644 index 8a4fa14..0000000 --- a/lib/sol2/examples/interop/tolua/source/tolua_Player.h +++ /dev/null @@ -1,217 +0,0 @@ -/* -** Lua binding: Player -** Generated automatically by tolua++-1.0.93-lua53 on Sat Feb 10 08:48:53 2018. -*/ - -#ifndef __cplusplus -#include "stdlib.h" -#endif -#include "string.h" - -#include "tolua++.h" - -/* Exported function */ -TOLUA_API int tolua_Player_open (lua_State* tolua_S); - -#include "Player.h" - -/* function to release collected object via destructor */ -#ifdef __cplusplus - -static int tolua_collect_Player (lua_State* tolua_S) -{ - Player* self = (Player*) tolua_tousertype(tolua_S,1,0); - Mtolua_delete(self); - return 0; -} -#endif - - -/* function to register type */ -static void tolua_reg_types (lua_State* tolua_S) -{ - tolua_usertype(tolua_S,"Player"); -} - -/* method: new of class Player */ -#ifndef TOLUA_DISABLE_tolua_Player_Player_new00 -static int tolua_Player_Player_new00(lua_State* tolua_S) -{ -#ifndef TOLUA_RELEASE - tolua_Error tolua_err; - if ( - !tolua_isusertable(tolua_S,1,"Player",0,&tolua_err) || - !tolua_isnoobj(tolua_S,2,&tolua_err) - ) - goto tolua_lerror; - else -#endif - { - { - Player* tolua_ret = (Player*) Mtolua_new((Player)()); - tolua_pushusertype(tolua_S,(void*)tolua_ret,"Player"); - } - } - return 1; -#ifndef TOLUA_RELEASE - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'new'.",&tolua_err); - return 0; -#endif -} -#endif //#ifndef TOLUA_DISABLE - -/* method: new_local of class Player */ -#ifndef TOLUA_DISABLE_tolua_Player_Player_new00_local -static int tolua_Player_Player_new00_local(lua_State* tolua_S) -{ -#ifndef TOLUA_RELEASE - tolua_Error tolua_err; - if ( - !tolua_isusertable(tolua_S,1,"Player",0,&tolua_err) || - !tolua_isnoobj(tolua_S,2,&tolua_err) - ) - goto tolua_lerror; - else -#endif - { - { - Player* tolua_ret = (Player*) Mtolua_new((Player)()); - tolua_pushusertype(tolua_S,(void*)tolua_ret,"Player"); - tolua_register_gc(tolua_S,lua_gettop(tolua_S)); - } - } - return 1; -#ifndef TOLUA_RELEASE - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'new'.",&tolua_err); - return 0; -#endif -} -#endif //#ifndef TOLUA_DISABLE - -/* method: delete of class Player */ -#ifndef TOLUA_DISABLE_tolua_Player_Player_delete00 -static int tolua_Player_Player_delete00(lua_State* tolua_S) -{ -#ifndef TOLUA_RELEASE - tolua_Error tolua_err; - if ( - !tolua_isusertype(tolua_S,1,"Player",0,&tolua_err) || - !tolua_isnoobj(tolua_S,2,&tolua_err) - ) - goto tolua_lerror; - else -#endif - { - Player* self = (Player*) tolua_tousertype(tolua_S,1,0); -#ifndef TOLUA_RELEASE - if (!self) tolua_error(tolua_S,"invalid 'self' in function 'delete'", NULL); -#endif - Mtolua_delete(self); - } - return 0; -#ifndef TOLUA_RELEASE - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'delete'.",&tolua_err); - return 0; -#endif -} -#endif //#ifndef TOLUA_DISABLE - -/* method: setHealth of class Player */ -#ifndef TOLUA_DISABLE_tolua_Player_Player_setHealth00 -static int tolua_Player_Player_setHealth00(lua_State* tolua_S) -{ -#ifndef TOLUA_RELEASE - tolua_Error tolua_err; - if ( - !tolua_isusertype(tolua_S,1,"Player",0,&tolua_err) || - !tolua_isnumber(tolua_S,2,0,&tolua_err) || - !tolua_isnoobj(tolua_S,3,&tolua_err) - ) - goto tolua_lerror; - else -#endif - { - Player* self = (Player*) tolua_tousertype(tolua_S,1,0); - int _health = ((int) tolua_tonumber(tolua_S,2,0)); -#ifndef TOLUA_RELEASE - if (!self) tolua_error(tolua_S,"invalid 'self' in function 'setHealth'", NULL); -#endif - { - self->setHealth(_health); - } - } - return 0; -#ifndef TOLUA_RELEASE - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'setHealth'.",&tolua_err); - return 0; -#endif -} -#endif //#ifndef TOLUA_DISABLE - -/* method: getHealth of class Player */ -#ifndef TOLUA_DISABLE_tolua_Player_Player_getHealth00 -static int tolua_Player_Player_getHealth00(lua_State* tolua_S) -{ -#ifndef TOLUA_RELEASE - tolua_Error tolua_err; - if ( - !tolua_isusertype(tolua_S,1,"Player",0,&tolua_err) || - !tolua_isnoobj(tolua_S,2,&tolua_err) - ) - goto tolua_lerror; - else -#endif - { - Player* self = (Player*) tolua_tousertype(tolua_S,1,0); -#ifndef TOLUA_RELEASE - if (!self) tolua_error(tolua_S,"invalid 'self' in function 'getHealth'", NULL); -#endif - { - int tolua_ret = (int) self->getHealth(); - tolua_pushnumber(tolua_S,(lua_Number)tolua_ret); - } - } - return 1; -#ifndef TOLUA_RELEASE - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'getHealth'.",&tolua_err); - return 0; -#endif -} -#endif //#ifndef TOLUA_DISABLE - -/* Open function */ -TOLUA_API int tolua_Player_open (lua_State* tolua_S) -{ - tolua_open(tolua_S); - tolua_reg_types(tolua_S); - tolua_module(tolua_S,NULL,0); - tolua_beginmodule(tolua_S,NULL); - #ifdef __cplusplus - tolua_cclass(tolua_S,"Player","Player","",tolua_collect_Player); - #else - tolua_cclass(tolua_S,"Player","Player","",NULL); - #endif - tolua_beginmodule(tolua_S,"Player"); - tolua_function(tolua_S,"new",tolua_Player_Player_new00); - tolua_function(tolua_S,"new_local",tolua_Player_Player_new00_local); - tolua_function(tolua_S,".call",tolua_Player_Player_new00_local); - tolua_function(tolua_S,"delete",tolua_Player_Player_delete00); - tolua_function(tolua_S,"setHealth",tolua_Player_Player_setHealth00); - tolua_function(tolua_S,"getHealth",tolua_Player_Player_getHealth00); - tolua_endmodule(tolua_S); - tolua_endmodule(tolua_S); - return 1; -} - - -#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 501 - TOLUA_API int luaopen_Player (lua_State* tolua_S) { - return tolua_Player_open(tolua_S); -}; -#endif - -- cgit v1.2.3