Permalink
Browse files

Move to pointers for Dynamic_Cast_Conversions to avoid problems with …

…using the class before it's defined
  • Loading branch information...
1 parent 1e1385b commit e68599920a6c4b6729b1fc6de6a5d706b5996239 @lefticus lefticus committed Apr 25, 2013
View
6 include/chaiscript/dispatchkit/boxed_cast.hpp
@@ -68,7 +68,7 @@ namespace chaiscript
/// assert(i == 5);
/// \endcode
template<typename Type>
- typename detail::Cast_Helper<Type>::Result_Type boxed_cast(const Boxed_Value &bv, const Dynamic_Cast_Conversions &t_conversions = Dynamic_Cast_Conversions())
+ typename detail::Cast_Helper<Type>::Result_Type boxed_cast(const Boxed_Value &bv, const Dynamic_Cast_Conversions *t_conversions = 0)
{
try {
return detail::Cast_Helper<Type>::cast(bv, t_conversions);
@@ -81,12 +81,12 @@ namespace chaiscript
#pragma warning(disable : 4127)
#endif
- if (boost::is_polymorphic<typename detail::Stripped_Type<Type>::type>::value)
+ if (boost::is_polymorphic<typename detail::Stripped_Type<Type>::type>::value && t_conversions)
{
try {
// We will not catch any bad_boxed_dynamic_cast that is thrown, let the user get it
// either way, we are not responsible if it doesn't work
- return detail::Cast_Helper<Type>::cast(t_conversions.boxed_dynamic_cast<Type>(bv), t_conversions);
+ return detail::Cast_Helper<Type>::cast(t_conversions->boxed_dynamic_cast<Type>(bv), t_conversions);
} catch (const boost::bad_any_cast &) {
throw exception::bad_boxed_cast(bv.get_type_info(), typeid(Type));
}
View
16 include/chaiscript/dispatchkit/boxed_cast_helper.hpp
@@ -31,7 +31,7 @@ namespace chaiscript
{
typedef typename boost::reference_wrapper<typename boost::add_const<Result>::type > Result_Type;
- static Result_Type cast(const Boxed_Value &ob, const Dynamic_Cast_Conversions &)
+ static Result_Type cast(const Boxed_Value &ob, const Dynamic_Cast_Conversions *)
{
if (ob.is_ref())
{
@@ -73,7 +73,7 @@ namespace chaiscript
{
typedef const Result * Result_Type;
- static Result_Type cast(const Boxed_Value &ob, const Dynamic_Cast_Conversions &)
+ static Result_Type cast(const Boxed_Value &ob, const Dynamic_Cast_Conversions *)
{
if (ob.is_ref())
{
@@ -102,7 +102,7 @@ namespace chaiscript
{
typedef Result * Result_Type;
- static Result_Type cast(const Boxed_Value &ob, const Dynamic_Cast_Conversions &)
+ static Result_Type cast(const Boxed_Value &ob, const Dynamic_Cast_Conversions *)
{
if (ob.is_ref())
{
@@ -121,7 +121,7 @@ namespace chaiscript
{
typedef typename boost::reference_wrapper<Result> Result_Type;
- static Result_Type cast(const Boxed_Value &ob, const Dynamic_Cast_Conversions &)
+ static Result_Type cast(const Boxed_Value &ob, const Dynamic_Cast_Conversions *)
{
if (ob.is_ref())
{
@@ -140,7 +140,7 @@ namespace chaiscript
{
typedef typename boost::shared_ptr<Result> Result_Type;
- static Result_Type cast(const Boxed_Value &ob, const Dynamic_Cast_Conversions &)
+ static Result_Type cast(const Boxed_Value &ob, const Dynamic_Cast_Conversions *)
{
return boost::any_cast<boost::shared_ptr<Result> >(ob.get());
}
@@ -154,7 +154,7 @@ namespace chaiscript
{
typedef typename boost::shared_ptr<const Result> Result_Type;
- static Result_Type cast(const Boxed_Value &ob, const Dynamic_Cast_Conversions &)
+ static Result_Type cast(const Boxed_Value &ob, const Dynamic_Cast_Conversions *)
{
if (!ob.get_type_info().is_const())
{
@@ -202,7 +202,7 @@ namespace chaiscript
{
typedef const Boxed_Value & Result_Type;
- static Result_Type cast(const Boxed_Value &ob, const Dynamic_Cast_Conversions &)
+ static Result_Type cast(const Boxed_Value &ob, const Dynamic_Cast_Conversions *)
{
return ob;
}
@@ -263,7 +263,7 @@ namespace chaiscript
{
typedef typename Cast_Helper_Inner<T>::Result_Type Result_Type;
- static Result_Type cast(const Boxed_Value &ob, const Dynamic_Cast_Conversions &t_conversions)
+ static Result_Type cast(const Boxed_Value &ob, const Dynamic_Cast_Conversions *t_conversions)
{
return Cast_Helper_Inner<T>::cast(ob, t_conversions);
}
View
2 include/chaiscript/dispatchkit/boxed_number.hpp
@@ -820,7 +820,7 @@ namespace chaiscript
{
typedef Boxed_Number Result_Type;
- static Result_Type cast(const Boxed_Value &ob, const Dynamic_Cast_Conversions &)
+ static Result_Type cast(const Boxed_Value &ob, const Dynamic_Cast_Conversions *)
{
return Boxed_Number(ob);
}
View
2 include/chaiscript/dispatchkit/dispatchkit.hpp
@@ -395,7 +395,7 @@ namespace chaiscript
template<typename Type>
typename detail::Cast_Helper<Type>::Result_Type boxed_cast(const Boxed_Value &bv) const
{
- return chaiscript::boxed_cast<Type>(bv, m_conversions);
+ return chaiscript::boxed_cast<Type>(bv, &m_conversions);
}
/**
View
8 include/chaiscript/dispatchkit/dynamic_cast_conversion.hpp
@@ -91,7 +91,7 @@ namespace chaiscript
if (t_derived.is_const())
{
boost::shared_ptr<const Base> data
- = boost::dynamic_pointer_cast<const Base>(detail::Cast_Helper<boost::shared_ptr<const Derived> >::cast(t_derived, Dynamic_Cast_Conversions()));
+ = boost::dynamic_pointer_cast<const Base>(detail::Cast_Helper<boost::shared_ptr<const Derived> >::cast(t_derived, 0));
if (!data)
{
throw std::bad_cast();
@@ -100,7 +100,7 @@ namespace chaiscript
return Boxed_Value(data);
} else {
boost::shared_ptr<Base> data
- = boost::dynamic_pointer_cast<Base>(detail::Cast_Helper<boost::shared_ptr<Derived> >::cast(t_derived, Dynamic_Cast_Conversions()));
+ = boost::dynamic_pointer_cast<Base>(detail::Cast_Helper<boost::shared_ptr<Derived> >::cast(t_derived, 0));
if (!data)
{
@@ -113,11 +113,11 @@ namespace chaiscript
// Pull the reference out of the contained boxed value, which we know is the type we want
if (t_derived.is_const())
{
- const Derived &d = detail::Cast_Helper<const Derived &>::cast(t_derived, Dynamic_Cast_Conversions());
+ const Derived &d = detail::Cast_Helper<const Derived &>::cast(t_derived, 0);
const Base &data = dynamic_cast<const Base &>(d);
return Boxed_Value(boost::cref(data));
} else {
- Derived &d = detail::Cast_Helper<Derived &>::cast(t_derived, Dynamic_Cast_Conversions());
+ Derived &d = detail::Cast_Helper<Derived &>::cast(t_derived, 0);
Base &data = dynamic_cast<Base &>(d);
return Boxed_Value(boost::ref(data));
}
View
12 include/chaiscript/dispatchkit/function_call.hpp
@@ -32,7 +32,7 @@ namespace chaiscript
*/
template<typename FunctionType>
boost::function<FunctionType>
- functor(const std::vector<Const_Proxy_Function> &funcs, const Dynamic_Cast_Conversions &t_conversions)
+ functor(const std::vector<Const_Proxy_Function> &funcs, const Dynamic_Cast_Conversions *t_conversions)
{
FunctionType *p=0;
return detail::build_function_caller_helper(p, funcs, t_conversions);
@@ -53,7 +53,7 @@ namespace chaiscript
*/
template<typename FunctionType>
boost::function<FunctionType>
- functor(Const_Proxy_Function func, const Dynamic_Cast_Conversions &t_conversions)
+ functor(Const_Proxy_Function func, const Dynamic_Cast_Conversions *t_conversions)
{
std::vector<Const_Proxy_Function> funcs;
funcs.push_back(func);
@@ -66,7 +66,7 @@ namespace chaiscript
*/
template<typename FunctionType>
boost::function<FunctionType>
- functor(const Boxed_Value &bv, const Dynamic_Cast_Conversions &t_conversions)
+ functor(const Boxed_Value &bv, const Dynamic_Cast_Conversions *t_conversions)
{
return functor<FunctionType>(boxed_cast<Const_Proxy_Function >(bv, t_conversions), t_conversions);
}
@@ -81,7 +81,7 @@ namespace chaiscript
{
typedef boost::function<Signature> Result_Type;
- static Result_Type cast(const Boxed_Value &ob, const Dynamic_Cast_Conversions &t_conversions)
+ static Result_Type cast(const Boxed_Value &ob, const Dynamic_Cast_Conversions *t_conversions)
{
if (ob.get_type_info().bare_equal(user_type<Const_Proxy_Function>()))
{
@@ -100,7 +100,7 @@ namespace chaiscript
{
typedef boost::function<Signature> Result_Type;
- static Result_Type cast(const Boxed_Value &ob, const Dynamic_Cast_Conversions &t_conversions)
+ static Result_Type cast(const Boxed_Value &ob, const Dynamic_Cast_Conversions *t_conversions)
{
if (ob.get_type_info().bare_equal(user_type<Const_Proxy_Function>()))
{
@@ -119,7 +119,7 @@ namespace chaiscript
{
typedef boost::function<Signature> Result_Type;
- static Result_Type cast(const Boxed_Value &ob, const Dynamic_Cast_Conversions &t_conversions)
+ static Result_Type cast(const Boxed_Value &ob, const Dynamic_Cast_Conversions *t_conversions)
{
if (ob.get_type_info().bare_equal(user_type<Const_Proxy_Function>()))
{
View
8 include/chaiscript/dispatchkit/function_call_detail.hpp
@@ -81,9 +81,9 @@ namespace chaiscript
{
std::vector<Boxed_Value> params;
- BOOST_PP_REPEAT(n, addparam, ~)
+ BOOST_PP_REPEAT(n, addparam, ~);
- return Function_Caller_Ret<Ret>::call(funcs, params, t_conversions);
+ return Function_Caller_Ret<Ret>::call(funcs, params, t_conversions);
}
/**
@@ -92,7 +92,7 @@ namespace chaiscript
template<typename Ret BOOST_PP_COMMA_IF(n) BOOST_PP_ENUM_PARAMS(n, typename Param) >
boost::function<Ret (BOOST_PP_ENUM_PARAMS(n, Param)) >
build_function_caller_helper(Ret (BOOST_PP_ENUM_PARAMS(n, Param)), const std::vector<Const_Proxy_Function> &funcs,
- const Dynamic_Cast_Conversions &t_conversions)
+ const Dynamic_Cast_Conversions *t_conversions)
{
if (funcs.size() == 1)
{
@@ -108,7 +108,7 @@ namespace chaiscript
// we cannot make any other guesses or assumptions really, so continuing
}
- return boost::bind(&function_caller<Ret BOOST_PP_COMMA_IF(n) BOOST_PP_ENUM_PARAMS(n, Param)>, funcs, t_conversions
+ return boost::bind(&function_caller<Ret BOOST_PP_COMMA_IF(n) BOOST_PP_ENUM_PARAMS(n, Param)>, funcs, (t_conversions?*t_conversions:Dynamic_Cast_Conversions())
BOOST_PP_ENUM_TRAILING(n, curry, ~));
}
}
View
4 include/chaiscript/dispatchkit/proxy_functions.hpp
@@ -574,10 +574,10 @@ namespace chaiscript
const Boxed_Value &bv = params[0];
if (bv.is_const())
{
- const Class *o = boxed_cast<const Class *>(bv, t_conversions);
+ const Class *o = boxed_cast<const Class *>(bv, &t_conversions);
return detail::Handle_Return<typename boost::add_reference<T>::type>::handle(o->*m_attr);
} else {
- Class *o = boxed_cast<Class *>(bv, t_conversions);
+ Class *o = boxed_cast<Class *>(bv, &t_conversions);
return detail::Handle_Return<typename boost::add_reference<T>::type>::handle(o->*m_attr);
}
} else {
View
4 include/chaiscript/dispatchkit/proxy_functions_detail.hpp
@@ -7,8 +7,8 @@
#include <boost/preprocessor.hpp>
#define gettypeinfo(z,n,text) ti.push_back(chaiscript::detail::Get_Type_Info<Param ## n>::get());
-#define casthelper(z,n,text) BOOST_PP_COMMA_IF(n) chaiscript::boxed_cast< Param ## n >(params[n], t_conversions)
-#define trycast(z,n,text) chaiscript::boxed_cast<Param ## n>(params[n], t_conversions);
+#define casthelper(z,n,text) BOOST_PP_COMMA_IF(n) chaiscript::boxed_cast< Param ## n >(params[n], &t_conversions)
+#define trycast(z,n,text) chaiscript::boxed_cast<Param ## n>(params[n], &t_conversions);
#ifndef BOOST_PP_IS_ITERATING
#ifndef CHAISCRIPT_PROXY_FUNCTIONS_DETAIL_HPP_

0 comments on commit e685999

Please sign in to comment.