speed up operator calls by about 10% by reducing Proxy_Function copies and such

This commit is contained in:
Jason Turner
2009-08-29 19:19:31 +00:00
parent c8c1c65e8c
commit 89186a86c8
3 changed files with 39 additions and 20 deletions

View File

@@ -86,7 +86,7 @@ namespace chaiscript
virtual Boxed_Value operator()(const std::vector<Boxed_Value> &params)
{
return dispatch(m_funcs, params);
return dispatch(m_funcs.begin(), m_funcs.end(), params);
}
virtual std::vector<Type_Info> get_param_types() const
@@ -371,6 +371,13 @@ namespace chaiscript
m_reserved_words.insert(name);
}
Boxed_Value call_function(const std::string &t_name, const std::vector<Boxed_Value> &params)
{
std::pair<std::multimap<std::string, Proxy_Function >::const_iterator, std::multimap<std::string, Proxy_Function >::const_iterator> range
= m_functions.equal_range(t_name);
return dispatch(range.first, range.second, params);
}
private:
/**

View File

@@ -410,17 +410,16 @@ namespace chaiscript
* each function against the set of parameters, in order, until a matching
* function is found or throw dispatch_error if no matching function is found
*/
Boxed_Value dispatch(const std::vector<std::pair<std::string, Proxy_Function> > &funcs,
template<typename InItr>
Boxed_Value dispatch(InItr begin, InItr end,
const std::vector<Boxed_Value> &plist)
{
for (std::vector<std::pair<std::string, Proxy_Function> >::const_iterator itr = funcs.begin();
itr != funcs.end();
++itr)
while (begin != end)
{
try {
if (itr->second->filter(plist))
if (begin->second->filter(plist))
{
return (*itr->second)(plist);
return (*begin->second)(plist);
}
} catch (const bad_boxed_cast &) {
//parameter failed to cast, try again
@@ -430,9 +429,22 @@ namespace chaiscript
//guard failed to allow the function to execute,
//try again
}
++begin;
}
throw dispatch_error();
}
/**
* Take a vector of functions and a vector of parameters. Attempt to execute
* each function against the set of parameters, in order, until a matching
* function is found or throw dispatch_error if no matching function is found
*/
Boxed_Value dispatch(const std::vector<std::pair<std::string, Proxy_Function> > &funcs,
const std::vector<Boxed_Value> &plist)
{
return dispatch(funcs.begin(), funcs.end(), plist);
}
}