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

Add direct access to Boxed_Value data * for high performance operations

Browse Source
This commit is contained in:
Jason Turner 2011-06-03 12:41:38 -06:00
parent 2c4d69bfc0
commit 6491262491
2 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/chaiscript/dispatchkit/boxed_numeric.hpp
View File

@ -164,15 +164,15 @@ namespace chaiscript
{ {
if (t_oper > Operators::boolean_flag && t_oper < Operators::non_const_flag) if (t_oper > Operators::boolean_flag && t_oper < Operators::non_const_flag)
{ {
return boolean::go<LHS, RHS>(t_oper, boxed_cast<const LHS &>(t_lhs), boxed_cast<const RHS &>(t_rhs)); return boolean::go<LHS, RHS>(t_oper, *static_cast<const LHS *>(t_lhs.get_const_ptr()), *static_cast<const RHS *>(t_rhs.get_const_ptr()));
} else if (t_oper > Operators::non_const_flag && t_oper < Operators::non_const_int_flag) { } else if (t_oper > Operators::non_const_flag && t_oper < Operators::non_const_int_flag && !t_lhs.is_const()) {
return binary::go<LHS, RHS>(t_oper, boxed_cast<LHS &>(t_lhs), boxed_cast<const RHS &>(t_rhs)); return binary::go<LHS, RHS>(t_oper, *static_cast<LHS *>(t_lhs.get_ptr()), *static_cast<const RHS *>(t_rhs.get_const_ptr()));
} else if (t_oper > Operators::non_const_int_flag && t_oper < Operators::const_int_flag) { } else if (t_oper > Operators::non_const_int_flag && t_oper < Operators::const_int_flag && !t_lhs.is_const()) {
return binary_int::go<LHS, RHS>(t_oper, boxed_cast<LHS &>(t_lhs), boxed_cast<const RHS &>(t_rhs)); return binary_int::go<LHS, RHS>(t_oper, *static_cast<LHS *>(t_lhs.get_ptr()), *static_cast<const RHS *>(t_rhs.get_const_ptr()));
} else if (t_oper > Operators::const_int_flag && t_oper < Operators::const_flag) { } else if (t_oper > Operators::const_int_flag && t_oper < Operators::const_flag) {
return const_binary_int::go<LHS, RHS>(t_oper, boxed_cast<const LHS &>(t_lhs), boxed_cast<const RHS &>(t_rhs)); return const_binary_int::go<LHS, RHS>(t_oper, *static_cast<const LHS *>(t_lhs.get_const_ptr()), *static_cast<const RHS *>(t_rhs.get_const_ptr()));
} else if (t_oper > Operators::const_flag) { } else if (t_oper > Operators::const_flag) {
return const_binary::go<LHS, RHS>(t_oper, boxed_cast<const LHS &>(t_lhs), boxed_cast<const RHS &>(t_rhs)); return const_binary::go<LHS, RHS>(t_oper, *static_cast<const LHS *>(t_lhs.get_const_ptr()), *static_cast<const RHS *>(t_rhs.get_const_ptr()));
} else { } else {
throw boost::bad_any_cast(); throw boost::bad_any_cast();
} }
@ -186,15 +186,15 @@ namespace chaiscript
{ {
if (t_oper > Operators::boolean_flag && t_oper < Operators::non_const_flag) if (t_oper > Operators::boolean_flag && t_oper < Operators::non_const_flag)
{ {
return boolean::go<LHS, RHS>(t_oper, boxed_cast<const LHS &>(t_lhs), boxed_cast<const RHS &>(t_rhs)); return boolean::go<LHS, RHS>(t_oper, *static_cast<const LHS *>(t_lhs.get_const_ptr()), *static_cast<const RHS *>(t_rhs.get_const_ptr()));
} else if (t_oper > Operators::non_const_flag && t_oper < Operators::non_const_int_flag) { } else if (t_oper > Operators::non_const_flag && t_oper < Operators::non_const_int_flag && !t_lhs.is_const()) {
return binary::go<LHS, RHS>(t_oper, boxed_cast<LHS &>(t_lhs), boxed_cast<const RHS &>(t_rhs)); return binary::go<LHS, RHS>(t_oper, *static_cast<LHS *>(t_lhs.get_ptr()), *static_cast<const RHS *>(t_rhs.get_const_ptr()));
} else if (t_oper > Operators::non_const_int_flag && t_oper < Operators::const_int_flag) { } else if (t_oper > Operators::non_const_int_flag && t_oper < Operators::const_int_flag) {
throw boost::bad_any_cast(); throw boost::bad_any_cast();
} else if (t_oper > Operators::const_int_flag && t_oper < Operators::const_flag) { } else if (t_oper > Operators::const_int_flag && t_oper < Operators::const_flag) {
throw boost::bad_any_cast(); throw boost::bad_any_cast();
} else if (t_oper > Operators::const_flag) { } else if (t_oper > Operators::const_flag) {
return const_binary::go<LHS, RHS>(t_oper, boxed_cast<const LHS &>(t_lhs), boxed_cast<const RHS &>(t_rhs)); return const_binary::go<LHS, RHS>(t_oper, *static_cast<const LHS *>(t_lhs.get_const_ptr()), *static_cast<const RHS *>(t_rhs.get_const_ptr()));
} else { } else {
throw boost::bad_any_cast(); throw boost::bad_any_cast();
} }

54
include/chaiscript/dispatchkit/boxed_value.hpp
View File

@ -23,6 +23,7 @@
namespace chaiscript namespace chaiscript
{ {
/// \brief A wrapper for holding any valid C++ type. All types in ChaiScript are Boxed_Value objects /// \brief A wrapper for holding any valid C++ type. All types in ChaiScript are Boxed_Value objects
/// \sa chaiscript::boxed_cast /// \sa chaiscript::boxed_cast
class Boxed_Value class Boxed_Value
@ -41,19 +42,12 @@ namespace chaiscript
*/ */
struct Data struct Data
{ {
template<typename T>
static bool is_null(boost::any *a)
{
boost::shared_ptr<T> *ptr = boost::any_cast<boost::shared_ptr<T> >(a);
return ptr->get() == 0;
}
Data(const Type_Info &ti, Data(const Type_Info &ti,
const boost::any &to, const boost::any &to,
bool tr, bool tr,
const boost::function<bool (boost::any*)> &t_is_null = boost::function<bool (boost::any*)>()) const void *t_void_ptr)
: m_type_info(ti), m_obj(to), : m_type_info(ti), m_obj(to), m_data_ptr(ti.is_const()?0:const_cast<void *>(t_void_ptr)), m_const_data_ptr(t_void_ptr),
m_is_ref(tr), m_is_null(t_is_null) m_is_ref(tr)
{ {
} }
@ -62,7 +56,8 @@ namespace chaiscript
m_type_info = rhs.m_type_info; m_type_info = rhs.m_type_info;
m_obj = rhs.m_obj; m_obj = rhs.m_obj;
m_is_ref = rhs.m_is_ref; m_is_ref = rhs.m_is_ref;
m_is_null = rhs.m_is_null; m_data_ptr = rhs.m_data_ptr;
m_const_data_ptr = rhs.m_const_data_ptr;
return *this; return *this;
} }
@ -73,8 +68,9 @@ namespace chaiscript
Type_Info m_type_info; Type_Info m_type_info;
boost::any m_obj; boost::any m_obj;
void *m_data_ptr;
const void *m_const_data_ptr;
bool m_is_ref; bool m_is_ref;
boost::function<bool (boost::any*)> m_is_null;
std::vector<boost::shared_ptr<Data> > m_dependencies; std::vector<boost::shared_ptr<Data> > m_dependencies;
}; };
@ -85,7 +81,8 @@ namespace chaiscript
return boost::shared_ptr<Data> (new Data( return boost::shared_ptr<Data> (new Data(
detail::Get_Type_Info<void>::get(), detail::Get_Type_Info<void>::get(),
boost::any(), boost::any(),
false) false,
0)
); );
} }
@ -102,7 +99,7 @@ namespace chaiscript
detail::Get_Type_Info<T>::get(), detail::Get_Type_Info<T>::get(),
boost::any(obj), boost::any(obj),
false, false,
boost::function<bool (boost::any *)>(&Data::is_null<T>)) obj.get())
); );
} }
@ -117,19 +114,21 @@ namespace chaiscript
{ {
return boost::shared_ptr<Data>(new Data( return boost::shared_ptr<Data>(new Data(
detail::Get_Type_Info<T>::get(), detail::Get_Type_Info<T>::get(),
boost::any(obj), boost::any(obj),
true) true,
obj.get_pointer())
); );
} }
template<typename T> template<typename T>
static boost::shared_ptr<Data> get(const T& t) static boost::shared_ptr<Data> get(const T& t)
{ {
boost::shared_ptr<T> p(new T(t));
return boost::shared_ptr<Data>(new Data( return boost::shared_ptr<Data>(new Data(
detail::Get_Type_Info<T>::get(), detail::Get_Type_Info<T>::get(),
boost::any(boost::shared_ptr<T>(new T(t))), boost::any(p),
false, false,
boost::function<bool (boost::any *)>(&Data::is_null<T>)) p.get())
); );
} }
@ -138,7 +137,8 @@ namespace chaiscript
return boost::shared_ptr<Data> (new Data( return boost::shared_ptr<Data> (new Data(
Type_Info(), Type_Info(),
boost::any(), boost::any(),
false) false,
0)
); );
} }
@ -224,12 +224,7 @@ namespace chaiscript
bool is_null() const bool is_null() const
{ {
if (m_data->m_is_null) return (m_data->m_data_ptr == 0 && m_data->m_const_data_ptr == 0);
{
return m_data->m_is_null(&m_data->m_obj);
} else {
return false;
}
} }
const boost::any & get() const const boost::any & get() const
@ -265,6 +260,15 @@ namespace chaiscript
} }
} }
void *get_ptr() const
{
return m_data->m_data_ptr;
}
const void *get_const_ptr() const
{
return m_data->m_const_data_ptr;
}
private: private:
boost::shared_ptr<Data> m_data; boost::shared_ptr<Data> m_data;