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

Clean up some of the function callback and functor code, for easier registration, etc.

Browse Source
This commit is contained in:
Jason Turner
2009-06-23 03:01:56 +00:00
parent d02620bb1b
commit 32edcf170d
2 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
dispatchkit/function_call.hpp
View File

@@ -54,19 +54,35 @@ namespace dispatchkit
namespace dispatchkit namespace dispatchkit
{ {
template<typename FunctionType, typename Function> template<typename FunctionType>
boost::function<FunctionType> boost::function<FunctionType>
build_function_caller(Function func) build_function_caller(const std::vector<std::pair<std::string, boost::shared_ptr<Proxy_Function> > > &funcs)
{ {
FunctionType *p; FunctionType *p;
return build_function_caller_helper(p, func); return build_function_caller_helper(p, funcs);
} }
template<typename FunctionType>
boost::function<FunctionType>
build_function_caller(boost::shared_ptr<Proxy_Function> func)
{
std::vector<std::pair<std::string, boost::shared_ptr<Proxy_Function> > > funcs;
funcs.push_back(std::make_pair(std::string(), func));
return build_function_caller<FunctionType>(funcs);
}
template<typename FunctionType>
boost::function<FunctionType>
build_function_caller(const Boxed_Value &bv)
{
return build_function_caller<FunctionType>(boxed_cast<boost::shared_ptr<Proxy_Function> >(bv));
}
template<typename FunctionType, typename ScriptEngine> template<typename FunctionType, typename ScriptEngine>
boost::function<FunctionType> build_functor(ScriptEngine &e, const std::string &script) boost::function<FunctionType> build_functor(ScriptEngine &e, const std::string &script)
{ {
return build_function_caller<FunctionType>(boxed_cast<boost::shared_ptr<Proxy_Function> >(e.evaluate_string(script))); return build_function_caller<FunctionType>(e.evaluate_string(script));
} }
} }
@@ -87,16 +103,6 @@ namespace dispatchkit
return Function_Caller_Ret<Ret>().call(funcs, params); return Function_Caller_Ret<Ret>().call(funcs, params);
} }
template<typename Ret BOOST_PP_COMMA_IF(n) BOOST_PP_ENUM_PARAMS(n, typename Param) >
boost::function<Ret (BOOST_PP_ENUM_PARAMS(n, Param)) >
build_function_caller_helper(Ret (BOOST_PP_ENUM_PARAMS(n, Param)), boost::shared_ptr<Proxy_Function> func)
{
std::vector<std::pair<std::string, boost::shared_ptr<Proxy_Function> > > funcs;
funcs.push_back(std::make_pair(std::string(), func));
return boost::bind(&function_caller<Ret BOOST_PP_COMMA_IF(n) BOOST_PP_ENUM_PARAMS(n, Param)>, funcs
BOOST_PP_ENUM_TRAILING(n, curry, ~));
}
template<typename Ret BOOST_PP_COMMA_IF(n) BOOST_PP_ENUM_PARAMS(n, typename Param) > template<typename Ret BOOST_PP_COMMA_IF(n) BOOST_PP_ENUM_PARAMS(n, typename Param) >
boost::function<Ret (BOOST_PP_ENUM_PARAMS(n, Param)) > boost::function<Ret (BOOST_PP_ENUM_PARAMS(n, Param)) >
build_function_caller_helper(Ret (BOOST_PP_ENUM_PARAMS(n, Param)), const std::vector<std::pair<std::string, boost::shared_ptr<Proxy_Function> > > &funcs) build_function_caller_helper(Ret (BOOST_PP_ENUM_PARAMS(n, Param)), const std::vector<std::pair<std::string, boost::shared_ptr<Proxy_Function> > > &funcs)

1
samples/callbacks.chai
View File

@@ -4,5 +4,4 @@ cb_handler.add_callbacks( function() { "DivOnePtTwo"; }, function (x) { x / 1.2;
cb_handler.add_callbacks( function() { "DivOnePtTwo"; }, function (x) { blargh; } );