coffee/ChaiScript
1
0
Fork 0
mirror of https://github.com/ChaiScript/ChaiScript.git synced 2026-02-07 02:09:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move from multimap to sorted vector in dispatch

Browse Source
This commit is contained in:
Jason Turner 2015-06-08 15:19:32 -06:00
parent d4e22c2c2c
commit ba492308f4
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -852,17 +852,18 @@ namespace chaiscript
const std::vector<Boxed_Value> &plist, const Type_Conversions &t_conversions) const std::vector<Boxed_Value> &plist, const Type_Conversions &t_conversions)
{ {
//std::cout << "starting dispatch: " << funcs.size() << '\n'; //std::cout << "starting dispatch: " << funcs.size() << '\n';
std::multimap<size_t, const Proxy_Function_Base *> ordered_funcs; std::vector<std::pair<size_t, const Proxy_Function_Base *>> ordered_funcs;
ordered_funcs.reserve(funcs.size());
for (const auto &func : funcs) for (const auto &func : funcs)
{ {
size_t numdiffs = 0;
const auto arity = func->get_arity(); const auto arity = func->get_arity();
if (arity == -1) if (arity == -1)
{ {
numdiffs = plist.size(); ordered_funcs.emplace_back(plist.size(), func.get());
} else if (arity == static_cast<int>(plist.size())) { } else if (arity == static_cast<int>(plist.size())) {
size_t numdiffs = 0;
for (size_t i = 0; i < plist.size(); ++i) for (size_t i = 0; i < plist.size(); ++i)
{ {
if (!func->get_param_types()[i+1].bare_equal(plist[i].get_type_info())) if (!func->get_param_types()[i+1].bare_equal(plist[i].get_type_info()))
@ -870,13 +871,19 @@ namespace chaiscript
++numdiffs; ++numdiffs;
} }
} }
ordered_funcs.emplace_back(numdiffs, func.get());
} else { } else {
continue; continue;
} }
ordered_funcs.insert(std::make_pair(numdiffs, func.get()));
} }
std::stable_sort(ordered_funcs.begin(), ordered_funcs.end(),
[](const decltype(ordered_funcs)::const_reference &t_lhs, const decltype(ordered_funcs)::const_reference &t_rhs)
{
return t_lhs.first < t_rhs.first;
}
);
for (const auto &func : ordered_funcs ) for (const auto &func : ordered_funcs )
{ {
try { try {