[Rcpp-commits] r1093 - pkg/Rcpp/inst/include/Rcpp scripts

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Wed Apr 21 11:36:28 CEST 2010


Author: romain
Date: 2010-04-21 11:36:26 +0200 (Wed, 21 Apr 2010)
New Revision: 1093

Modified:
   pkg/Rcpp/inst/include/Rcpp/preprocessor.h
   pkg/Rcpp/inst/include/Rcpp/preprocessor_generated.h
   scripts/preprocessor.R
Log:
using BEGIN_RCPP and END_RCPP, and leaving the client a chance to define them themselves

Modified: pkg/Rcpp/inst/include/Rcpp/preprocessor.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/preprocessor.h	2010-04-21 09:22:52 UTC (rev 1092)
+++ pkg/Rcpp/inst/include/Rcpp/preprocessor.h	2010-04-21 09:36:26 UTC (rev 1093)
@@ -47,6 +47,14 @@
 } // namespace internal
 } // namespace Rcpp
 
+#ifndef BEGIN_RCPP
+#define BEGIN_RCPP try{ 
+#endif 
+
+#ifndef END_RCPP
+#define END_RCPP } catch( std::exception& __ex___ ){ forward_exception_to_r( __ex__ ) ; }
+#endif
+
 #include <Rcpp/preprocessor_generated.h>
 
 #endif

Modified: pkg/Rcpp/inst/include/Rcpp/preprocessor_generated.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/preprocessor_generated.h	2010-04-21 09:22:52 UTC (rev 1092)
+++ pkg/Rcpp/inst/include/Rcpp/preprocessor_generated.h	2010-04-21 09:36:26 UTC (rev 1093)
@@ -25,862 +25,730 @@
 // {{{ RCPP_FUNCTION 
 
 
-#define RCPP_FUNCTION_0(__OUT__,__NAME__)  \
-__OUT__ RCPP_DECORATE(__NAME__)() ;     \
-extern "C" SEXP __NAME__(){          \
-SEXP res = R_NilValue ;                 \
-try{                                    \
-	res = ::Rcpp::wrap( RCPP_DECORATE(__NAME__)() ) ; \
-} catch( std::exception& __ex__ ){      \
-	forward_exception_to_r( __ex__ ) ;  \
-}                                       \
-return res ;                            \
-}                                       \
+#define RCPP_FUNCTION_0(__OUT__,__NAME__)        \
+__OUT__ RCPP_DECORATE(__NAME__)() ;               \
+extern "C" SEXP __NAME__(){                       \
+SEXP res = R_NilValue ;                             \
+BEGIN_RCPP                                          \
+res = ::Rcpp::wrap( RCPP_DECORATE(__NAME__)() ) ; \
+END_RCPP                                            \
+return res ;                                        \
+}                                                   \
 __OUT__ RCPP_DECORATE(__NAME__)()
 
-#define RCPP_FUNCTION_1(__OUT__,__NAME__, ___0)  \
-__OUT__ RCPP_DECORATE(__NAME__)(___0) ;     \
-extern "C" SEXP __NAME__(SEXP x0){          \
-SEXP res = R_NilValue ;                 \
-try{                                    \
-	res = ::Rcpp::wrap( RCPP_DECORATE(__NAME__)(::Rcpp::internal::converter( x0 )) ) ; \
-} catch( std::exception& __ex__ ){      \
-	forward_exception_to_r( __ex__ ) ;  \
-}                                       \
-return res ;                            \
-}                                       \
+#define RCPP_FUNCTION_1(__OUT__,__NAME__, ___0)        \
+__OUT__ RCPP_DECORATE(__NAME__)(___0) ;               \
+extern "C" SEXP __NAME__(SEXP x0){                       \
+SEXP res = R_NilValue ;                             \
+BEGIN_RCPP                                          \
+res = ::Rcpp::wrap( RCPP_DECORATE(__NAME__)(::Rcpp::internal::converter( x0 )) ) ; \
+END_RCPP                                            \
+return res ;                                        \
+}                                                   \
 __OUT__ RCPP_DECORATE(__NAME__)(___0)
 
-#define RCPP_FUNCTION_2(__OUT__,__NAME__, ___0, ___1)  \
-__OUT__ RCPP_DECORATE(__NAME__)(___0, ___1) ;     \
-extern "C" SEXP __NAME__(SEXP x0, SEXP x1){          \
-SEXP res = R_NilValue ;                 \
-try{                                    \
-	res = ::Rcpp::wrap( RCPP_DECORATE(__NAME__)(::Rcpp::internal::converter( x0 ), ::Rcpp::internal::converter( x1 )) ) ; \
-} catch( std::exception& __ex__ ){      \
-	forward_exception_to_r( __ex__ ) ;  \
-}                                       \
-return res ;                            \
-}                                       \
+#define RCPP_FUNCTION_2(__OUT__,__NAME__, ___0, ___1)        \
+__OUT__ RCPP_DECORATE(__NAME__)(___0, ___1) ;               \
+extern "C" SEXP __NAME__(SEXP x0, SEXP x1){                       \
+SEXP res = R_NilValue ;                             \
+BEGIN_RCPP                                          \
+res = ::Rcpp::wrap( RCPP_DECORATE(__NAME__)(::Rcpp::internal::converter( x0 ), ::Rcpp::internal::converter( x1 )) ) ; \
+END_RCPP                                            \
+return res ;                                        \
+}                                                   \
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1)
 
-#define RCPP_FUNCTION_3(__OUT__,__NAME__, ___0, ___1, ___2)  \
-__OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2) ;     \
-extern "C" SEXP __NAME__(SEXP x0, SEXP x1, SEXP x2){          \
-SEXP res = R_NilValue ;                 \
-try{                                    \
-	res = ::Rcpp::wrap( RCPP_DECORATE(__NAME__)(::Rcpp::internal::converter( x0 ), ::Rcpp::internal::converter( x1 ), ::Rcpp::internal::converter( x2 )) ) ; \
-} catch( std::exception& __ex__ ){      \
-	forward_exception_to_r( __ex__ ) ;  \
-}                                       \
-return res ;                            \
-}                                       \
+#define RCPP_FUNCTION_3(__OUT__,__NAME__, ___0, ___1, ___2)        \
+__OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2) ;               \
+extern "C" SEXP __NAME__(SEXP x0, SEXP x1, SEXP x2){                       \
+SEXP res = R_NilValue ;                             \
+BEGIN_RCPP                                          \
+res = ::Rcpp::wrap( RCPP_DECORATE(__NAME__)(::Rcpp::internal::converter( x0 ), ::Rcpp::internal::converter( x1 ), ::Rcpp::internal::converter( x2 )) ) ; \
+END_RCPP                                            \
+return res ;                                        \
+}                                                   \
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2)
 
-#define RCPP_FUNCTION_4(__OUT__,__NAME__, ___0, ___1, ___2, ___3)  \
-__OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3) ;     \
-extern "C" SEXP __NAME__(SEXP x0, SEXP x1, SEXP x2, SEXP x3){          \
-SEXP res = R_NilValue ;                 \
-try{                                    \
-	res = ::Rcpp::wrap( RCPP_DECORATE(__NAME__)(::Rcpp::internal::converter( x0 ), ::Rcpp::internal::converter( x1 ), ::Rcpp::internal::converter( x2 ), ::Rcpp::internal::converter( x3 )) ) ; \
-} catch( std::exception& __ex__ ){      \
-	forward_exception_to_r( __ex__ ) ;  \
-}                                       \
-return res ;                            \
-}                                       \
+#define RCPP_FUNCTION_4(__OUT__,__NAME__, ___0, ___1, ___2, ___3)        \
+__OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3) ;               \
+extern "C" SEXP __NAME__(SEXP x0, SEXP x1, SEXP x2, SEXP x3){                       \
+SEXP res = R_NilValue ;                             \
+BEGIN_RCPP                                          \
+res = ::Rcpp::wrap( RCPP_DECORATE(__NAME__)(::Rcpp::internal::converter( x0 ), ::Rcpp::internal::converter( x1 ), ::Rcpp::internal::converter( x2 ), ::Rcpp::internal::converter( x3 )) ) ; \
+END_RCPP                                            \
+return res ;                                        \
+}                                                   \
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3)
 
-#define RCPP_FUNCTION_5(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4)  \
-__OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4) ;     \
-extern "C" SEXP __NAME__(SEXP x0, SEXP x1, SEXP x2, SEXP x3, SEXP x4){          \
-SEXP res = R_NilValue ;                 \
-try{                                    \
-	res = ::Rcpp::wrap( RCPP_DECORATE(__NAME__)(::Rcpp::internal::converter( x0 ), ::Rcpp::internal::converter( x1 ), ::Rcpp::internal::converter( x2 ), ::Rcpp::internal::converter( x3 ), ::Rcpp::internal::converter( x4 )) ) ; \
-} catch( std::exception& __ex__ ){      \
-	forward_exception_to_r( __ex__ ) ;  \
-}                                       \
-return res ;                            \
-}                                       \
+#define RCPP_FUNCTION_5(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4)        \
+__OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4) ;               \
+extern "C" SEXP __NAME__(SEXP x0, SEXP x1, SEXP x2, SEXP x3, SEXP x4){                       \
+SEXP res = R_NilValue ;                             \
+BEGIN_RCPP                                          \
+res = ::Rcpp::wrap( RCPP_DECORATE(__NAME__)(::Rcpp::internal::converter( x0 ), ::Rcpp::internal::converter( x1 ), ::Rcpp::internal::converter( x2 ), ::Rcpp::internal::converter( x3 ), ::Rcpp::internal::converter( x4 )) ) ; \
+END_RCPP                                            \
+return res ;                                        \
+}                                                   \
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4)
 
-#define RCPP_FUNCTION_6(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5)  \
-__OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5) ;     \
-extern "C" SEXP __NAME__(SEXP x0, SEXP x1, SEXP x2, SEXP x3, SEXP x4, SEXP x5){          \
-SEXP res = R_NilValue ;                 \
-try{                                    \
-	res = ::Rcpp::wrap( RCPP_DECORATE(__NAME__)(::Rcpp::internal::converter( x0 ), ::Rcpp::internal::converter( x1 ), ::Rcpp::internal::converter( x2 ), ::Rcpp::internal::converter( x3 ), ::Rcpp::internal::converter( x4 ), ::Rcpp::internal::converter( x5 )) ) ; \
-} catch( std::exception& __ex__ ){      \
-	forward_exception_to_r( __ex__ ) ;  \
-}                                       \
-return res ;                            \
-}                                       \
+#define RCPP_FUNCTION_6(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5)        \
+__OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5) ;               \
+extern "C" SEXP __NAME__(SEXP x0, SEXP x1, SEXP x2, SEXP x3, SEXP x4, SEXP x5){                       \
+SEXP res = R_NilValue ;                             \
+BEGIN_RCPP                                          \
+res = ::Rcpp::wrap( RCPP_DECORATE(__NAME__)(::Rcpp::internal::converter( x0 ), ::Rcpp::internal::converter( x1 ), ::Rcpp::internal::converter( x2 ), ::Rcpp::internal::converter( x3 ), ::Rcpp::internal::converter( x4 ), ::Rcpp::internal::converter( x5 )) ) ; \
+END_RCPP                                            \
+return res ;                                        \
+}                                                   \
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5)
 
-#define RCPP_FUNCTION_7(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6)  \
-__OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6) ;     \
-extern "C" SEXP __NAME__(SEXP x0, SEXP x1, SEXP x2, SEXP x3, SEXP x4, SEXP x5, SEXP x6){          \
-SEXP res = R_NilValue ;                 \
-try{                                    \
-	res = ::Rcpp::wrap( RCPP_DECORATE(__NAME__)(::Rcpp::internal::converter( x0 ), ::Rcpp::internal::converter( x1 ), ::Rcpp::internal::converter( x2 ), ::Rcpp::internal::converter( x3 ), ::Rcpp::internal::converter( x4 ), ::Rcpp::internal::converter( x5 ), ::Rcpp::internal::converter( x6 )) ) ; \
-} catch( std::exception& __ex__ ){      \
-	forward_exception_to_r( __ex__ ) ;  \
-}                                       \
-return res ;                            \
-}                                       \
+#define RCPP_FUNCTION_7(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6)        \
+__OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6) ;               \
+extern "C" SEXP __NAME__(SEXP x0, SEXP x1, SEXP x2, SEXP x3, SEXP x4, SEXP x5, SEXP x6){                       \
+SEXP res = R_NilValue ;                             \
+BEGIN_RCPP                                          \
+res = ::Rcpp::wrap( RCPP_DECORATE(__NAME__)(::Rcpp::internal::converter( x0 ), ::Rcpp::internal::converter( x1 ), ::Rcpp::internal::converter( x2 ), ::Rcpp::internal::converter( x3 ), ::Rcpp::internal::converter( x4 ), ::Rcpp::internal::converter( x5 ), ::Rcpp::internal::converter( x6 )) ) ; \
+END_RCPP                                            \
+return res ;                                        \
+}                                                   \
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6)
 
-#define RCPP_FUNCTION_8(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7)  \
-__OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7) ;     \
-extern "C" SEXP __NAME__(SEXP x0, SEXP x1, SEXP x2, SEXP x3, SEXP x4, SEXP x5, SEXP x6, SEXP x7){          \
-SEXP res = R_NilValue ;                 \
-try{                                    \
-	res = ::Rcpp::wrap( RCPP_DECORATE(__NAME__)(::Rcpp::internal::converter( x0 ), ::Rcpp::internal::converter( x1 ), ::Rcpp::internal::converter( x2 ), ::Rcpp::internal::converter( x3 ), ::Rcpp::internal::converter( x4 ), ::Rcpp::internal::converter( x5 ), ::Rcpp::internal::converter( x6 ), ::Rcpp::internal::converter( x7 )) ) ; \
-} catch( std::exception& __ex__ ){      \
-	forward_exception_to_r( __ex__ ) ;  \
-}                                       \
-return res ;                            \
-}                                       \
+#define RCPP_FUNCTION_8(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7)        \
+__OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7) ;               \
+extern "C" SEXP __NAME__(SEXP x0, SEXP x1, SEXP x2, SEXP x3, SEXP x4, SEXP x5, SEXP x6, SEXP x7){                       \
+SEXP res = R_NilValue ;                             \
+BEGIN_RCPP                                          \
+res = ::Rcpp::wrap( RCPP_DECORATE(__NAME__)(::Rcpp::internal::converter( x0 ), ::Rcpp::internal::converter( x1 ), ::Rcpp::internal::converter( x2 ), ::Rcpp::internal::converter( x3 ), ::Rcpp::internal::converter( x4 ), ::Rcpp::internal::converter( x5 ), ::Rcpp::internal::converter( x6 ), ::Rcpp::internal::converter( x7 )) ) ; \
+END_RCPP                                            \
+return res ;                                        \
+}                                                   \
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7)
 
-#define RCPP_FUNCTION_9(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8)  \
-__OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8) ;     \
-extern "C" SEXP __NAME__(SEXP x0, SEXP x1, SEXP x2, SEXP x3, SEXP x4, SEXP x5, SEXP x6, SEXP x7, SEXP x8){          \
-SEXP res = R_NilValue ;                 \
-try{                                    \
-	res = ::Rcpp::wrap( RCPP_DECORATE(__NAME__)(::Rcpp::internal::converter( x0 ), ::Rcpp::internal::converter( x1 ), ::Rcpp::internal::converter( x2 ), ::Rcpp::internal::converter( x3 ), ::Rcpp::internal::converter( x4 ), ::Rcpp::internal::converter( x5 ), ::Rcpp::internal::converter( x6 ), ::Rcpp::internal::converter( x7 ), ::Rcpp::internal::converter( x8 )) ) ; \
-} catch( std::exception& __ex__ ){      \
-	forward_exception_to_r( __ex__ ) ;  \
-}                                       \
-return res ;                            \
-}                                       \
+#define RCPP_FUNCTION_9(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8)        \
+__OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8) ;               \
+extern "C" SEXP __NAME__(SEXP x0, SEXP x1, SEXP x2, SEXP x3, SEXP x4, SEXP x5, SEXP x6, SEXP x7, SEXP x8){                       \
+SEXP res = R_NilValue ;                             \
+BEGIN_RCPP                                          \
+res = ::Rcpp::wrap( RCPP_DECORATE(__NAME__)(::Rcpp::internal::converter( x0 ), ::Rcpp::internal::converter( x1 ), ::Rcpp::internal::converter( x2 ), ::Rcpp::internal::converter( x3 ), ::Rcpp::internal::converter( x4 ), ::Rcpp::internal::converter( x5 ), ::Rcpp::internal::converter( x6 ), ::Rcpp::internal::converter( x7 ), ::Rcpp::internal::converter( x8 )) ) ; \
+END_RCPP                                            \
+return res ;                                        \
+}                                                   \
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8)
 
-#define RCPP_FUNCTION_10(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9)  \
-__OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9) ;     \
-extern "C" SEXP __NAME__(SEXP x0, SEXP x1, SEXP x2, SEXP x3, SEXP x4, SEXP x5, SEXP x6, SEXP x7, SEXP x8, SEXP x9){          \
-SEXP res = R_NilValue ;                 \
-try{                                    \
-	res = ::Rcpp::wrap( RCPP_DECORATE(__NAME__)(::Rcpp::internal::converter( x0 ), ::Rcpp::internal::converter( x1 ), ::Rcpp::internal::converter( x2 ), ::Rcpp::internal::converter( x3 ), ::Rcpp::internal::converter( x4 ), ::Rcpp::internal::converter( x5 ), ::Rcpp::internal::converter( x6 ), ::Rcpp::internal::converter( x7 ), ::Rcpp::internal::converter( x8 ), ::Rcpp::internal::converter( x9 )) ) ; \
-} catch( std::exception& __ex__ ){      \
-	forward_exception_to_r( __ex__ ) ;  \
-}                                       \
-return res ;                            \
-}                                       \
+#define RCPP_FUNCTION_10(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9)        \
+__OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9) ;               \
+extern "C" SEXP __NAME__(SEXP x0, SEXP x1, SEXP x2, SEXP x3, SEXP x4, SEXP x5, SEXP x6, SEXP x7, SEXP x8, SEXP x9){                       \
+SEXP res = R_NilValue ;                             \
+BEGIN_RCPP                                          \
+res = ::Rcpp::wrap( RCPP_DECORATE(__NAME__)(::Rcpp::internal::converter( x0 ), ::Rcpp::internal::converter( x1 ), ::Rcpp::internal::converter( x2 ), ::Rcpp::internal::converter( x3 ), ::Rcpp::internal::converter( x4 ), ::Rcpp::internal::converter( x5 ), ::Rcpp::internal::converter( x6 ), ::Rcpp::internal::converter( x7 ), ::Rcpp::internal::converter( x8 ), ::Rcpp::internal::converter( x9 )) ) ; \
+END_RCPP                                            \
+return res ;                                        \
+}                                                   \
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9)
 
-#define RCPP_FUNCTION_11(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10)  \
-__OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10) ;     \
-extern "C" SEXP __NAME__(SEXP x0, SEXP x1, SEXP x2, SEXP x3, SEXP x4, SEXP x5, SEXP x6, SEXP x7, SEXP x8, SEXP x9, SEXP x10){          \
-SEXP res = R_NilValue ;                 \
-try{                                    \
-	res = ::Rcpp::wrap( RCPP_DECORATE(__NAME__)(::Rcpp::internal::converter( x0 ), ::Rcpp::internal::converter( x1 ), ::Rcpp::internal::converter( x2 ), ::Rcpp::internal::converter( x3 ), ::Rcpp::internal::converter( x4 ), ::Rcpp::internal::converter( x5 ), ::Rcpp::internal::converter( x6 ), ::Rcpp::internal::converter( x7 ), ::Rcpp::internal::converter( x8 ), ::Rcpp::internal::converter( x9 ), ::Rcpp::internal::converter( x10 )) ) ; \
-} catch( std::exception& __ex__ ){      \
-	forward_exception_to_r( __ex__ ) ;  \
-}                                       \
-return res ;                            \
-}                                       \
+#define RCPP_FUNCTION_11(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10)        \
+__OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10) ;               \
+extern "C" SEXP __NAME__(SEXP x0, SEXP x1, SEXP x2, SEXP x3, SEXP x4, SEXP x5, SEXP x6, SEXP x7, SEXP x8, SEXP x9, SEXP x10){                       \
+SEXP res = R_NilValue ;                             \
+BEGIN_RCPP                                          \
+res = ::Rcpp::wrap( RCPP_DECORATE(__NAME__)(::Rcpp::internal::converter( x0 ), ::Rcpp::internal::converter( x1 ), ::Rcpp::internal::converter( x2 ), ::Rcpp::internal::converter( x3 ), ::Rcpp::internal::converter( x4 ), ::Rcpp::internal::converter( x5 ), ::Rcpp::internal::converter( x6 ), ::Rcpp::internal::converter( x7 ), ::Rcpp::internal::converter( x8 ), ::Rcpp::internal::converter( x9 ), ::Rcpp::internal::converter( x10 )) ) ; \
+END_RCPP                                            \
+return res ;                                        \
+}                                                   \
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10)
 
-#define RCPP_FUNCTION_12(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11)  \
-__OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11) ;     \
-extern "C" SEXP __NAME__(SEXP x0, SEXP x1, SEXP x2, SEXP x3, SEXP x4, SEXP x5, SEXP x6, SEXP x7, SEXP x8, SEXP x9, SEXP x10, SEXP x11){          \
-SEXP res = R_NilValue ;                 \
-try{                                    \
-	res = ::Rcpp::wrap( RCPP_DECORATE(__NAME__)(::Rcpp::internal::converter( x0 ), ::Rcpp::internal::converter( x1 ), ::Rcpp::internal::converter( x2 ), ::Rcpp::internal::converter( x3 ), ::Rcpp::internal::converter( x4 ), ::Rcpp::internal::converter( x5 ), ::Rcpp::internal::converter( x6 ), ::Rcpp::internal::converter( x7 ), ::Rcpp::internal::converter( x8 ), ::Rcpp::internal::converter( x9 ), ::Rcpp::internal::converter( x10 ), ::Rcpp::internal::converter( x11 )) ) ; \
-} catch( std::exception& __ex__ ){      \
-	forward_exception_to_r( __ex__ ) ;  \
-}                                       \
-return res ;                            \
-}                                       \
+#define RCPP_FUNCTION_12(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11)        \
+__OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11) ;               \
+extern "C" SEXP __NAME__(SEXP x0, SEXP x1, SEXP x2, SEXP x3, SEXP x4, SEXP x5, SEXP x6, SEXP x7, SEXP x8, SEXP x9, SEXP x10, SEXP x11){                       \
+SEXP res = R_NilValue ;                             \
+BEGIN_RCPP                                          \
+res = ::Rcpp::wrap( RCPP_DECORATE(__NAME__)(::Rcpp::internal::converter( x0 ), ::Rcpp::internal::converter( x1 ), ::Rcpp::internal::converter( x2 ), ::Rcpp::internal::converter( x3 ), ::Rcpp::internal::converter( x4 ), ::Rcpp::internal::converter( x5 ), ::Rcpp::internal::converter( x6 ), ::Rcpp::internal::converter( x7 ), ::Rcpp::internal::converter( x8 ), ::Rcpp::internal::converter( x9 ), ::Rcpp::internal::converter( x10 ), ::Rcpp::internal::converter( x11 )) ) ; \
+END_RCPP                                            \
+return res ;                                        \
+}                                                   \
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11)
 
-#define RCPP_FUNCTION_13(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12)  \
-__OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12) ;     \
-extern "C" SEXP __NAME__(SEXP x0, SEXP x1, SEXP x2, SEXP x3, SEXP x4, SEXP x5, SEXP x6, SEXP x7, SEXP x8, SEXP x9, SEXP x10, SEXP x11, SEXP x12){          \
-SEXP res = R_NilValue ;                 \
-try{                                    \
-	res = ::Rcpp::wrap( RCPP_DECORATE(__NAME__)(::Rcpp::internal::converter( x0 ), ::Rcpp::internal::converter( x1 ), ::Rcpp::internal::converter( x2 ), ::Rcpp::internal::converter( x3 ), ::Rcpp::internal::converter( x4 ), ::Rcpp::internal::converter( x5 ), ::Rcpp::internal::converter( x6 ), ::Rcpp::internal::converter( x7 ), ::Rcpp::internal::converter( x8 ), ::Rcpp::internal::converter( x9 ), ::Rcpp::internal::converter( x10 ), ::Rcpp::internal::converter( x11 ), ::Rcpp::internal::converter( x12 )) ) ; \
-} catch( std::exception& __ex__ ){      \
-	forward_exception_to_r( __ex__ ) ;  \
-}                                       \
-return res ;                            \
-}                                       \
+#define RCPP_FUNCTION_13(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12)        \
+__OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12) ;               \
+extern "C" SEXP __NAME__(SEXP x0, SEXP x1, SEXP x2, SEXP x3, SEXP x4, SEXP x5, SEXP x6, SEXP x7, SEXP x8, SEXP x9, SEXP x10, SEXP x11, SEXP x12){                       \
+SEXP res = R_NilValue ;                             \
+BEGIN_RCPP                                          \
+res = ::Rcpp::wrap( RCPP_DECORATE(__NAME__)(::Rcpp::internal::converter( x0 ), ::Rcpp::internal::converter( x1 ), ::Rcpp::internal::converter( x2 ), ::Rcpp::internal::converter( x3 ), ::Rcpp::internal::converter( x4 ), ::Rcpp::internal::converter( x5 ), ::Rcpp::internal::converter( x6 ), ::Rcpp::internal::converter( x7 ), ::Rcpp::internal::converter( x8 ), ::Rcpp::internal::converter( x9 ), ::Rcpp::internal::converter( x10 ), ::Rcpp::internal::converter( x11 ), ::Rcpp::internal::converter( x12 )) ) ; \
+END_RCPP                                            \
+return res ;                                        \
+}                                                   \
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12)
 
-#define RCPP_FUNCTION_14(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13)  \
-__OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13) ;     \
-extern "C" SEXP __NAME__(SEXP x0, SEXP x1, SEXP x2, SEXP x3, SEXP x4, SEXP x5, SEXP x6, SEXP x7, SEXP x8, SEXP x9, SEXP x10, SEXP x11, SEXP x12, SEXP x13){          \
-SEXP res = R_NilValue ;                 \
-try{                                    \
-	res = ::Rcpp::wrap( RCPP_DECORATE(__NAME__)(::Rcpp::internal::converter( x0 ), ::Rcpp::internal::converter( x1 ), ::Rcpp::internal::converter( x2 ), ::Rcpp::internal::converter( x3 ), ::Rcpp::internal::converter( x4 ), ::Rcpp::internal::converter( x5 ), ::Rcpp::internal::converter( x6 ), ::Rcpp::internal::converter( x7 ), ::Rcpp::internal::converter( x8 ), ::Rcpp::internal::converter( x9 ), ::Rcpp::internal::converter( x10 ), ::Rcpp::internal::converter( x11 ), ::Rcpp::internal::converter( x12 ), ::Rcpp::internal::converter( x13 )) ) ; \
-} catch( std::exception& __ex__ ){      \
-	forward_exception_to_r( __ex__ ) ;  \
-}                                       \
-return res ;                            \
-}                                       \
+#define RCPP_FUNCTION_14(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13)        \
+__OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13) ;               \
+extern "C" SEXP __NAME__(SEXP x0, SEXP x1, SEXP x2, SEXP x3, SEXP x4, SEXP x5, SEXP x6, SEXP x7, SEXP x8, SEXP x9, SEXP x10, SEXP x11, SEXP x12, SEXP x13){                       \
+SEXP res = R_NilValue ;                             \
+BEGIN_RCPP                                          \
+res = ::Rcpp::wrap( RCPP_DECORATE(__NAME__)(::Rcpp::internal::converter( x0 ), ::Rcpp::internal::converter( x1 ), ::Rcpp::internal::converter( x2 ), ::Rcpp::internal::converter( x3 ), ::Rcpp::internal::converter( x4 ), ::Rcpp::internal::converter( x5 ), ::Rcpp::internal::converter( x6 ), ::Rcpp::internal::converter( x7 ), ::Rcpp::internal::converter( x8 ), ::Rcpp::internal::converter( x9 ), ::Rcpp::internal::converter( x10 ), ::Rcpp::internal::converter( x11 ), ::Rcpp::internal::converter( x12 ), ::Rcpp::internal::converter( x13 )) ) ; \
+END_RCPP                                            \
+return res ;                                        \
+}                                                   \
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13)
 
-#define RCPP_FUNCTION_15(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14)  \
-__OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14) ;     \
-extern "C" SEXP __NAME__(SEXP x0, SEXP x1, SEXP x2, SEXP x3, SEXP x4, SEXP x5, SEXP x6, SEXP x7, SEXP x8, SEXP x9, SEXP x10, SEXP x11, SEXP x12, SEXP x13, SEXP x14){          \
-SEXP res = R_NilValue ;                 \
-try{                                    \
-	res = ::Rcpp::wrap( RCPP_DECORATE(__NAME__)(::Rcpp::internal::converter( x0 ), ::Rcpp::internal::converter( x1 ), ::Rcpp::internal::converter( x2 ), ::Rcpp::internal::converter( x3 ), ::Rcpp::internal::converter( x4 ), ::Rcpp::internal::converter( x5 ), ::Rcpp::internal::converter( x6 ), ::Rcpp::internal::converter( x7 ), ::Rcpp::internal::converter( x8 ), ::Rcpp::internal::converter( x9 ), ::Rcpp::internal::converter( x10 ), ::Rcpp::internal::converter( x11 ), ::Rcpp::internal::converter( x12 ), ::Rcpp::internal::converter( x13 ), ::Rcpp::internal::converter( x14 )) ) ; \
-} catch( std::exception& __ex__ ){      \
-	forward_exception_to_r( __ex__ ) ;  \
-}                                       \
-return res ;                            \
-}                                       \
+#define RCPP_FUNCTION_15(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14)        \
+__OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14) ;               \
+extern "C" SEXP __NAME__(SEXP x0, SEXP x1, SEXP x2, SEXP x3, SEXP x4, SEXP x5, SEXP x6, SEXP x7, SEXP x8, SEXP x9, SEXP x10, SEXP x11, SEXP x12, SEXP x13, SEXP x14){                       \
+SEXP res = R_NilValue ;                             \
+BEGIN_RCPP                                          \
+res = ::Rcpp::wrap( RCPP_DECORATE(__NAME__)(::Rcpp::internal::converter( x0 ), ::Rcpp::internal::converter( x1 ), ::Rcpp::internal::converter( x2 ), ::Rcpp::internal::converter( x3 ), ::Rcpp::internal::converter( x4 ), ::Rcpp::internal::converter( x5 ), ::Rcpp::internal::converter( x6 ), ::Rcpp::internal::converter( x7 ), ::Rcpp::internal::converter( x8 ), ::Rcpp::internal::converter( x9 ), ::Rcpp::internal::converter( x10 ), ::Rcpp::internal::converter( x11 ), ::Rcpp::internal::converter( x12 ), ::Rcpp::internal::converter( x13 ), ::Rcpp::internal::converter( x14 )) ) ; \
+END_RCPP                                            \
+return res ;                                        \
+}                                                   \
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14)
 
-#define RCPP_FUNCTION_16(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15)  \
-__OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15) ;     \
-extern "C" SEXP __NAME__(SEXP x0, SEXP x1, SEXP x2, SEXP x3, SEXP x4, SEXP x5, SEXP x6, SEXP x7, SEXP x8, SEXP x9, SEXP x10, SEXP x11, SEXP x12, SEXP x13, SEXP x14, SEXP x15){          \
-SEXP res = R_NilValue ;                 \
-try{                                    \
-	res = ::Rcpp::wrap( RCPP_DECORATE(__NAME__)(::Rcpp::internal::converter( x0 ), ::Rcpp::internal::converter( x1 ), ::Rcpp::internal::converter( x2 ), ::Rcpp::internal::converter( x3 ), ::Rcpp::internal::converter( x4 ), ::Rcpp::internal::converter( x5 ), ::Rcpp::internal::converter( x6 ), ::Rcpp::internal::converter( x7 ), ::Rcpp::internal::converter( x8 ), ::Rcpp::internal::converter( x9 ), ::Rcpp::internal::converter( x10 ), ::Rcpp::internal::converter( x11 ), ::Rcpp::internal::converter( x12 ), ::Rcpp::internal::converter( x13 ), ::Rcpp::internal::converter( x14 ), ::Rcpp::internal::converter( x15 )) ) ; \
-} catch( std::exception& __ex__ ){      \
-	forward_exception_to_r( __ex__ ) ;  \
-}                                       \
-return res ;                            \
-}                                       \
+#define RCPP_FUNCTION_16(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15)        \
+__OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15) ;               \
+extern "C" SEXP __NAME__(SEXP x0, SEXP x1, SEXP x2, SEXP x3, SEXP x4, SEXP x5, SEXP x6, SEXP x7, SEXP x8, SEXP x9, SEXP x10, SEXP x11, SEXP x12, SEXP x13, SEXP x14, SEXP x15){                       \
+SEXP res = R_NilValue ;                             \
+BEGIN_RCPP                                          \
[TRUNCATED]

To get the complete diff run:
    svnlook diff /svnroot/rcpp -r 1093


More information about the Rcpp-commits mailing list