generic-library/ChaiScript
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some boxed_cast issues introduced with refactor

Browse Source
This commit is contained in:
Jason Turner
2016-04-14 19:06:37 -06:00
parent 49dfdfd15a
commit 7d9dbc3d86
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
include/chaiscript/dispatchkit/boxed_cast_helper.hpp
View File

@@ -29,6 +29,23 @@ namespace chaiscript
throw std::runtime_error("Attempted to dereference null Boxed_Value"); throw std::runtime_error("Attempted to dereference null Boxed_Value");
} }
static const void *verify_type_no_throw(const Boxed_Value &ob, const std::type_info &ti, const void *ptr) {
if (ob.get_type_info() == ti) {
return ptr;
} else {
throw chaiscript::detail::exception::bad_any_cast();
}
}
static void *verify_type_no_throw(const Boxed_Value &ob, const std::type_info &ti, void *ptr) {
if (!ob.is_const() && ob.get_type_info() == ti) {
return ptr;
} else {
throw chaiscript::detail::exception::bad_any_cast();
}
}
static const void *verify_type(const Boxed_Value &ob, const std::type_info &ti, const void *ptr) { static const void *verify_type(const Boxed_Value &ob, const std::type_info &ti, const void *ptr) {
if (ob.get_type_info().bare_equal_type_info(ti)) { if (ob.get_type_info().bare_equal_type_info(ti)) {
return throw_if_null(ptr); return throw_if_null(ptr);
@@ -65,9 +82,9 @@ namespace chaiscript
template<typename Result> template<typename Result>
struct Cast_Helper_Inner<const Result *> struct Cast_Helper_Inner<const Result *>
{ {
static auto cast(const Boxed_Value &ob, const Type_Conversions_State *) static const Result * cast(const Boxed_Value &ob, const Type_Conversions_State *)
{ {
return static_cast<const Result *>(verify_type(ob, typeid(Result), ob.get_const_ptr())); return static_cast<const Result *>(verify_type_no_throw(ob, typeid(Result), ob.get_const_ptr()));
} }
}; };
@@ -75,9 +92,9 @@ namespace chaiscript
template<typename Result> template<typename Result>
struct Cast_Helper_Inner<Result *> struct Cast_Helper_Inner<Result *>
{ {
static auto cast(const Boxed_Value &ob, const Type_Conversions_State *) static Result * cast(const Boxed_Value &ob, const Type_Conversions_State *)
{ {
return static_cast<Result *>(verify_type(ob, typeid(Result), ob.get_ptr())); return static_cast<Result *>(verify_type_no_throw(ob, typeid(Result), ob.get_ptr()));
} }
}; };

2
include/chaiscript/utility/utility.hpp
View File

@@ -15,7 +15,7 @@
#include "../chaiscript.hpp" #include "../chaiscript.hpp"
#include "../dispatchkit/proxy_functions.hpp" #include "../dispatchkit/proxy_functions.hpp"
#include "../dispatchkit/type_info.hpp" #include "../dispatchkit/type_info.hpp"
//#include "../dispatchkit/operators.hpp" #include "../dispatchkit/operators.hpp"
namespace chaiscript namespace chaiscript