Merge pull request #162 from cauthmann/std_function

Support std::function in InternalFunction

Author: eddelbuettel

inst/include/Rcpp/InternalFunction.h

@@ -26,13 +26,29 @@
 
 #include <Rcpp/grow.h>
 
+#ifdef RCPP_USE_STD_FUNCTION
+#include <Rcpp/InternalFunctionWithStdFunction.h>
+#endif
+
 namespace Rcpp{
 
     RCPP_API_CLASS(InternalFunction_Impl) {
     public:
 
         RCPP_GENERATE_CTOR_ASSIGN(InternalFunction_Impl)
 
+#ifdef RCPP_USE_STD_FUNCTION
+    	template <typename RESULT_TYPE, typename... Args>
+        InternalFunction_Impl(const std::function<RESULT_TYPE(Args...)> &fun) {
+        	set(
+        		XPtr<Rcpp::InternalFunctionWithStdFunction::CppFunctionBaseFromStdFunction<RESULT_TYPE, Args...> >(
+        			new Rcpp::InternalFunctionWithStdFunction::CppFunctionBaseFromStdFunction<RESULT_TYPE, Args...>(fun),
+        			false
+        		)
+        	);
+        }
+#endif
+
         #include <Rcpp/generated/InternalFunction__ctors.h>
         void update(SEXP){}
     private:

inst/include/Rcpp/InternalFunctionWithStdFunction.h

@@ -0,0 +1,69 @@
+// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
+//
+// InternalFunction_with_std_function.h: Rcpp R/C++ interface class library -- exposing C++ std::function's
+//
+// Copyright (C) 2014 Christian Authmann
+//
+// This file is part of Rcpp.
+//
+// Rcpp is free software: you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+//
+// Rcpp is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef Rcpp_InternalFunctionWithStdFunction_h
+#define Rcpp_InternalFunctionWithStdFunction_h
+
+#include <functional>
+
+namespace Rcpp{
+
+	namespace InternalFunctionWithStdFunction {
+
+		#include <Rcpp/generated/InternalFunctionWithStdFunction_call.h>
+
+		template <typename RESULT_TYPE, typename... Args>
+		class CppFunctionBaseFromStdFunction : public CppFunctionBase {
+			public:
+				CppFunctionBaseFromStdFunction(const std::function<RESULT_TYPE(Args...)> &fun) : fun(fun) {}
+				virtual ~CppFunctionBaseFromStdFunction() {}
+
+				SEXP operator()(SEXP* args) {
+					BEGIN_RCPP
+					auto result = call<RESULT_TYPE, Args...>(fun, args);
+					return Rcpp::module_wrap<RESULT_TYPE>(result);
+					END_RCPP
+				}
+
+			private:
+				const std::function<RESULT_TYPE(Args...)> fun;
+		};
+
+		template <typename... Args>
+		class CppFunctionBaseFromStdFunction<void, Args...> : public CppFunctionBase {
+			public:
+				CppFunctionBaseFromStdFunction(const std::function<void(Args...)> &fun) : fun(fun) {}
+				virtual ~CppFunctionBaseFromStdFunction() {}
+
+				SEXP operator()(SEXP* args) {
+					BEGIN_RCPP
+					call<void, Args...>(fun, args);
+					END_RCPP
+				}
+
+			private:
+				const std::function<void(Args...)> fun;
+		};
+
+	} // namespace InternalFunctionWithStdFunction
+} // namespace Rcpp
+
+#endif