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

Move to some standard algorithms

Browse Source
This commit is contained in:
Jason Turner 2015-06-19 14:57:54 -06:00
parent bcf573cf26
commit b7eb469ac1
1 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
include/chaiscript/dispatchkit/proxy_functions.hpp
View File

@ -749,28 +749,16 @@ namespace chaiscript
bool types_match_except_for_arithmetic(const FuncType &t_func, const std::vector<Boxed_Value> &plist, bool types_match_except_for_arithmetic(const FuncType &t_func, const std::vector<Boxed_Value> &plist,
const Type_Conversions &t_conversions) const Type_Conversions &t_conversions)
{ {
if (t_func->get_arity() != static_cast<int>(plist.size())) assert(plist.size() == types.size() - 1);
{
return false;
}
const std::vector<Type_Info> &types = t_func->get_param_types(); const std::vector<Type_Info> &types = t_func->get_param_types();
assert(plist.size() == types.size() - 1); return std::mismatch(plist.begin(), plist.end(),
types.begin()+1,
for (size_t i = 0; i < plist.size(); ++i) [&](const Boxed_Value &bv, const Type_Info &ti) {
{ return Proxy_Function_Base::compare_type_to_param(ti, bv, t_conversions)
if (Proxy_Function_Base::compare_type_to_param(types[i+1], plist[i], t_conversions) || (bv.get_type_info().is_arithmetic() && ti.is_arithmetic());
|| (types[i+1].is_arithmetic() && plist[i].get_type_info().is_arithmetic())) }
{ ) == std::make_pair(plist.end(), types.end());
// types continue to match
} else {
return false;
}
}
// all types match
return true;
} }
template<typename InItr, typename Funcs> template<typename InItr, typename Funcs>
@ -815,17 +803,22 @@ namespace chaiscript
std::vector<Boxed_Value> newplist; std::vector<Boxed_Value> newplist;
const std::vector<Type_Info> &tis = matching_func->second->get_param_types(); newplist.reserve(plist.size());
const std::vector<Type_Info> &tis = matching_func->second->get_param_types();
std::transform(tis.begin() + 1, tis.end(),
plist.begin(),
std::back_inserter(newplist),
[](const Type_Info &ti, const Boxed_Value &param) {
if (ti.is_arithmetic() && param.get_type_info().is_arithmetic()) {
return Boxed_Number(param).get_as(ti).bv;
} else {
return param;
}
}
);
for (size_t i = 0; i < plist.size(); ++i)
{
if (tis[i+1].is_arithmetic()
&& plist[i].get_type_info().is_arithmetic()) {
newplist.push_back(Boxed_Number(plist[i]).get_as(tis[i+1]).bv);
} else {
newplist.push_back(plist[i]);
}
}
try { try {
return (*(matching_func->second))(newplist, t_conversions); return (*(matching_func->second))(newplist, t_conversions);