Merge pull request #287 from romainfrancois/master

Fix memory leaks. closes #286

Author: eddelbuettel

inst/include/Rcpp/InternalFunctionWithStdFunction.h

@@ -3,6 +3,7 @@
 // InternalFunction_with_std_function.h: Rcpp R/C++ interface class library -- exposing C++ std::function's
 //
 // Copyright (C) 2014 Christian Authmann
+// Copyright (C) 2015 Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -37,10 +38,8 @@ namespace Rcpp{
 				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:
@@ -54,9 +53,7 @@ namespace Rcpp{
 				virtual ~CppFunctionBaseFromStdFunction() {}
 
 				SEXP operator()(SEXP* args) {
-					BEGIN_RCPP
 					call<void, Args...>(fun, args);
-					END_RCPP
 				}
 
 			private:

inst/include/Rcpp/api/meat/module/Module.h

@@ -1,6 +1,6 @@
 // Module.h: Rcpp R/C++ interface class library -- Rcpp modules
 //
-// Copyright (C) 2013 Romain Francois
+// Copyright (C) 2013 - 2015 Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -37,12 +37,10 @@ namespace Rcpp {
 	}
 
     inline CppClass Module::get_class( const std::string& cl ){
-        BEGIN_RCPP
             CLASS_MAP::iterator it = classes.find(cl) ;
             if( it == classes.end() ) throw std::range_error( "no such class" ) ;
             std::string buffer ;
             return CppClass( this, it->second, buffer ) ;
-        END_RCPP
     }
 
 }

inst/include/Rcpp/macros/macros.h

@@ -2,7 +2,7 @@
 //
 // macros.h: Rcpp R/C++ interface class library -- Rcpp macros
 //
-// Copyright (C) 2012 Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2012 - 2015 Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -27,21 +27,33 @@
 #define RCPP_GET_CLASS(x) Rf_getAttrib(x, R_ClassSymbol)
 
 #ifndef BEGIN_RCPP
-#define BEGIN_RCPP try {
+#define BEGIN_RCPP                                                                               \
+    int rcpp_output_type = 0 ;                                                                   \
+    SEXP rcpp_output_condition = R_NilValue ;                                                    \
+    try {
 #endif
 
 #ifndef VOID_END_RCPP
-#define VOID_END_RCPP                                                          \
-  }                                                                            \
-  catch (Rcpp::internal::InterruptedException &__ex__) {                       \
-    Rf_onintr();                                                               \
-  }                                                                            \
-  catch (std::exception &__ex__) {                                             \
-    forward_exception_to_r(__ex__);                                            \
-  }                                                                            \
-  catch (...) {                                                                \
-    ::Rf_error("c++ exception (unknown reason)");                              \
-  }
+#define VOID_END_RCPP                                                                            \
+    }                                                                                            \
+    catch( Rcpp::internal::InterruptedException &__ex__) {                                       \
+        rcpp_output_type = 1 ;                                                                   \
+    }                                                                                            \
+    catch( std::exception& __ex__ ){                                                             \
+       rcpp_output_type = 2 ;                                                                    \
+       rcpp_output_condition = PROTECT(exception_to_r_condition(__ex__)) ;                       \
+    } catch( ... ){                                                                              \
+       rcpp_output_type = 2 ;                                                                    \
+       rcpp_output_condition = PROTECT(string_to_try_error("c++ exception (unknown reason)")) ;  \
+    }                                                                                            \
+    if( rcpp_output_type == 1 ){                                                                 \
+       Rf_onintr() ;                                                                             \
+    }                                                                                            \
+    if( rcpp_output_type == 2 ){                                                                 \
+       SEXP stop_sym  = Rf_install( "stop" ) ;                                                   \
+       SEXP expr = PROTECT( Rf_lang2( stop_sym , rcpp_output_condition ) ) ;                     \
+       Rf_eval( expr, R_GlobalEnv ) ;                                                            \
+    }
 #endif
 
 #ifndef END_RCPP

inst/include/Rcpp/macros/xp.h

@@ -2,7 +2,7 @@
 //
 // xp.h: Rcpp R/C++ interface class library -- pre processor help
 //
-// Copyright (C) 2012 Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2012 - 2015 Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -33,11 +33,11 @@ extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)(){         \
     return info   ;                                            \
 }                                                              \
 extern "C" SEXP __NAME__( SEXP xp ){                           \
-	SEXP res = R_NilValue ;                                    \
 	BEGIN_RCPP                                                 \
+	    SEXP res = R_NilValue ;                                \
 		::Rcpp::XPtr< __CLASS__ > ptr(xp) ;                    \
 		res = ::Rcpp::wrap( ptr->__FIELD__ ) ;                 \
-	return res ;                                               \
+		return res ;                                           \
 	END_RCPP                                                   \
 }