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

Avoid attempting convert_down when not possible

Browse Source 
@arBmind this should be significant for you
This commit is contained in:
Jason Turner 2015-06-21 21:09:26 -06:00
parent cd2fb1ec66
commit 05bec3b4a8
1 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
include/chaiscript/dispatchkit/type_conversions.hpp
View File

@ -92,6 +92,11 @@ namespace chaiscript
return m_from; return m_from;
} }
virtual bool bidir() const
{
return true;
}
virtual ~Type_Conversion_Base() {} virtual ~Type_Conversion_Base() {}
protected: protected:
@ -262,6 +267,11 @@ namespace chaiscript
throw chaiscript::exception::bad_boxed_dynamic_cast(t_base.get_type_info(), typeid(Derived), "Unable to cast down inheritance hierarchy with non-polymorphic types"); throw chaiscript::exception::bad_boxed_dynamic_cast(t_base.get_type_info(), typeid(Derived), "Unable to cast down inheritance hierarchy with non-polymorphic types");
} }
virtual bool bidir() const
{
return false;
}
virtual Boxed_Value convert(const Boxed_Value &t_derived) const CHAISCRIPT_OVERRIDE virtual Boxed_Value convert(const Boxed_Value &t_derived) const CHAISCRIPT_OVERRIDE
{ {
return Static_Caster<Derived, Base>::cast(t_derived); return Static_Caster<Derived, Base>::cast(t_derived);
@ -291,6 +301,12 @@ namespace chaiscript
return m_func(t_from); return m_func(t_from);
} }
virtual bool bidir() const
{
return false;
}
private: private:
Callable m_func; Callable m_func;
}; };
@ -367,7 +383,7 @@ namespace chaiscript
const auto &types = thread_cache(); const auto &types = thread_cache();
if (types.count(to.bare_type_info()) != 0 && types.count(from.bare_type_info()) != 0) if (types.count(to.bare_type_info()) != 0 && types.count(from.bare_type_info()) != 0)
{ {
return has_conversion(to, from) || has_conversion(from, to); return has_conversion(to, from);
} else { } else {
return false; return false;
} }
@ -417,7 +433,7 @@ namespace chaiscript
bool has_conversion(const Type_Info &to, const Type_Info &from) const bool has_conversion(const Type_Info &to, const Type_Info &from) const
{ {
chaiscript::detail::threading::shared_lock<chaiscript::detail::threading::shared_mutex> l(m_mutex); chaiscript::detail::threading::shared_lock<chaiscript::detail::threading::shared_mutex> l(m_mutex);
return find(to, from) != m_conversions.end(); return find_bidir(to, from) != m_conversions.end();
} }
std::shared_ptr<detail::Type_Conversion_Base> get_conversion(const Type_Info &to, const Type_Info &from) const std::shared_ptr<detail::Type_Conversion_Base> get_conversion(const Type_Info &to, const Type_Info &from) const
@ -435,6 +451,19 @@ namespace chaiscript
} }
private: private:
std::set<std::shared_ptr<detail::Type_Conversion_Base> >::const_iterator find_bidir(
const Type_Info &to, const Type_Info &from) const
{
return std::find_if(m_conversions.begin(), m_conversions.end(),
[&to, &from](const std::shared_ptr<detail::Type_Conversion_Base> &conversion)
{
return (conversion->to().bare_equal(to) && conversion->from().bare_equal(from))
|| (conversion->bidir() && conversion->from().bare_equal(to) && conversion->to().bare_equal(from));
;
}
);
}
std::set<std::shared_ptr<detail::Type_Conversion_Base> >::const_iterator find( std::set<std::shared_ptr<detail::Type_Conversion_Base> >::const_iterator find(
const Type_Info &to, const Type_Info &from) const const Type_Info &to, const Type_Info &from) const
{ {