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

improvement to how handling of safe exceptions are done

Browse Source
This commit is contained in:
ThePhD 2017-10-20 20:59:52 -04:00
parent 3ee36c7d2e
commit 8811a268a2
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
single/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 2017-10-16 23:28:23.354459 UTC // Generated 2017-10-21 00:59:28.565154 UTC
// This header was generated with sol v2.18.4 (revision a679742) // This header was generated with sol v2.18.4 (revision 3ee36c7)
// https://github.com/ThePhD/sol2 // https://github.com/ThePhD/sol2
#ifndef SOL_SINGLE_INCLUDE_HPP #ifndef SOL_SINGLE_INCLUDE_HPP
@ -4391,13 +4391,13 @@ namespace sol {
try { try {
return f(L); return f(L);
} }
#if !defined(SOL_EXCEPTIONS_SAFE_PROPAGATION)
catch (const char* s) { catch (const char* s) {
lua_pushstring(L, s); lua_pushstring(L, s);
} }
catch (const std::exception& e) { catch (const std::exception& e) {
lua_pushstring(L, e.what()); lua_pushstring(L, e.what());
} }
#if !defined(SOL_EXCEPTIONS_SAFE_PROPAGATION)
catch (...) { catch (...) {
lua_pushstring(L, "caught (...) exception"); lua_pushstring(L, "caught (...) exception");
} }
@ -4435,13 +4435,13 @@ namespace sol {
try { try {
return f(L, std::forward<Args>(args)...); return f(L, std::forward<Args>(args)...);
} }
#if !defined(SOL_EXCEPTIONS_SAFE_PROPAGATION)
catch (const char* s) { catch (const char* s) {
lua_pushstring(L, s); lua_pushstring(L, s);
} }
catch (const std::exception& e) { catch (const std::exception& e) {
lua_pushstring(L, e.what()); lua_pushstring(L, e.what());
} }
#if !defined(SOL_EXCEPTIONS_SAFE_PROPAGATION)
catch (...) { catch (...) {
lua_pushstring(L, "caught (...) exception"); lua_pushstring(L, "caught (...) exception");
} }
@ -13075,6 +13075,7 @@ namespace sol {
returncount = poststacksize - (firstreturn - 1); returncount = poststacksize - (firstreturn - 1);
#ifndef SOL_NO_EXCEPTIONS #ifndef SOL_NO_EXCEPTIONS
} }
#if !defined(SOL_EXCEPTIONS_SAFE_PROPAGATION)
// Handle C++ errors thrown from C++ functions bound inside of lua // Handle C++ errors thrown from C++ functions bound inside of lua
catch (const char* error) { catch (const char* error) {
onexcept(error); onexcept(error);
@ -13091,6 +13092,9 @@ namespace sol {
firstreturn = lua_gettop(lua_state()); firstreturn = lua_gettop(lua_state());
return protected_function_result(lua_state(), firstreturn, 0, 1, call_status::runtime); return protected_function_result(lua_state(), firstreturn, 0, 1, call_status::runtime);
} }
#else
// do not handle exceptions: they can be propogated into C++ and keep all type information / rich information
#endif // about as safe as possible
#endif // No Exceptions #endif // No Exceptions
return protected_function_result(lua_state(), firstreturn, returncount, returncount, code); return protected_function_result(lua_state(), firstreturn, returncount, returncount, code);
} }

4
sol/protected_function.hpp
View File

@ -158,6 +158,7 @@ namespace sol {
returncount = poststacksize - (firstreturn - 1); returncount = poststacksize - (firstreturn - 1);
#ifndef SOL_NO_EXCEPTIONS #ifndef SOL_NO_EXCEPTIONS
} }
#if !defined(SOL_EXCEPTIONS_SAFE_PROPAGATION)
// Handle C++ errors thrown from C++ functions bound inside of lua // Handle C++ errors thrown from C++ functions bound inside of lua
catch (const char* error) { catch (const char* error) {
onexcept(error); onexcept(error);
@ -174,6 +175,9 @@ namespace sol {
firstreturn = lua_gettop(lua_state()); firstreturn = lua_gettop(lua_state());
return protected_function_result(lua_state(), firstreturn, 0, 1, call_status::runtime); return protected_function_result(lua_state(), firstreturn, 0, 1, call_status::runtime);
} }
#else
// do not handle exceptions: they can be propogated into C++ and keep all type information / rich information
#endif // about as safe as possible
#endif // No Exceptions #endif // No Exceptions
return protected_function_result(lua_state(), firstreturn, returncount, returncount, code); return protected_function_result(lua_state(), firstreturn, returncount, returncount, code);
} }

4
sol/types.hpp
View File

@ -73,13 +73,13 @@ namespace sol {
try { try {
return f(L); return f(L);
} }
#if !defined(SOL_EXCEPTIONS_SAFE_PROPAGATION)
catch (const char* s) { catch (const char* s) {
lua_pushstring(L, s); lua_pushstring(L, s);
} }
catch (const std::exception& e) { catch (const std::exception& e) {
lua_pushstring(L, e.what()); lua_pushstring(L, e.what());
} }
#if !defined(SOL_EXCEPTIONS_SAFE_PROPAGATION)
catch (...) { catch (...) {
lua_pushstring(L, "caught (...) exception"); lua_pushstring(L, "caught (...) exception");
} }
@ -117,13 +117,13 @@ namespace sol {
try { try {
return f(L, std::forward<Args>(args)...); return f(L, std::forward<Args>(args)...);
} }
#if !defined(SOL_EXCEPTIONS_SAFE_PROPAGATION)
catch (const char* s) { catch (const char* s) {
lua_pushstring(L, s); lua_pushstring(L, s);
} }
catch (const std::exception& e) { catch (const std::exception& e) {
lua_pushstring(L, e.what()); lua_pushstring(L, e.what());
} }
#if !defined(SOL_EXCEPTIONS_SAFE_PROPAGATION)
catch (...) { catch (...) {
lua_pushstring(L, "caught (...) exception"); lua_pushstring(L, "caught (...) exception");
} }