[Rcpp-commits] r2873 - in pkg/Rcpp: R inst/include/Rcpp/generated
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Mon Jan 17 15:36:22 CET 2011
Author: romain
Date: 2011-01-17 15:36:22 +0100 (Mon, 17 Jan 2011)
New Revision: 2873
Modified:
pkg/Rcpp/R/Module.R
pkg/Rcpp/inst/include/Rcpp/generated/Function__operator.h
Log:
some more debugging noise and fix Function::operator()
Modified: pkg/Rcpp/R/Module.R
===================================================================
--- pkg/Rcpp/R/Module.R 2011-01-17 14:22:09 UTC (rev 2872)
+++ pkg/Rcpp/R/Module.R 2011-01-17 14:36:22 UTC (rev 2873)
@@ -203,7 +203,6 @@
methods = methods,
where = where
)
- cat( " ... done\n" )
# just to make codetools happy
.self <- .refClassDef <- NULL
generator$methods(initialize =
Modified: pkg/Rcpp/inst/include/Rcpp/generated/Function__operator.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/generated/Function__operator.h 2011-01-17 14:22:09 UTC (rev 2872)
+++ pkg/Rcpp/inst/include/Rcpp/generated/Function__operator.h 2011-01-17 14:36:22 UTC (rev 2873)
@@ -32,102 +32,102 @@
*/
template <typename T1>
SEXP operator()(const T1& t1) const {
- return internal::try_catch( Rf_lang2( m_sexp, pairlist(t1) ) ) ;
+ return internal::try_catch( Rcpp_lcons( m_sexp, pairlist(t1) ) ) ;
}
template <typename T1, typename T2>
SEXP operator()(const T1& t1, const T2& t2) const {
- return internal::try_catch( Rf_lang2( m_sexp, pairlist(t1, t2) ) ) ;
+ return internal::try_catch( Rcpp_lcons( m_sexp, pairlist(t1, t2) ) ) ;
}
template <typename T1, typename T2, typename T3>
SEXP operator()(const T1& t1, const T2& t2, const T3& t3) const {
- return internal::try_catch( Rf_lang2( m_sexp, pairlist(t1, t2, t3) ) ) ;
+ return internal::try_catch( Rcpp_lcons( m_sexp, pairlist(t1, t2, t3) ) ) ;
}
template <typename T1, typename T2, typename T3, typename T4>
SEXP operator()(const T1& t1, const T2& t2, const T3& t3, const T4& t4) const {
- return internal::try_catch( Rf_lang2( m_sexp, pairlist(t1, t2, t3, t4) ) ) ;
+ return internal::try_catch( Rcpp_lcons( m_sexp, pairlist(t1, t2, t3, t4) ) ) ;
}
template <typename T1, typename T2, typename T3, typename T4, typename T5>
SEXP operator()(const T1& t1, const T2& t2, const T3& t3, const T4& t4, const T5& t5) const {
- return internal::try_catch( Rf_lang2( m_sexp, pairlist(t1, t2, t3, t4, t5) ) ) ;
+ return internal::try_catch( Rcpp_lcons( m_sexp, pairlist(t1, t2, t3, t4, t5) ) ) ;
}
template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
SEXP operator()(const T1& t1, const T2& t2, const T3& t3, const T4& t4, const T5& t5, const T6& t6) const {
- return internal::try_catch( Rf_lang2( m_sexp, pairlist(t1, t2, t3, t4, t5, t6) ) ) ;
+ return internal::try_catch( Rcpp_lcons( m_sexp, pairlist(t1, t2, t3, t4, t5, t6) ) ) ;
}
template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>
SEXP operator()(const T1& t1, const T2& t2, const T3& t3, const T4& t4, const T5& t5, const T6& t6, const T7& t7) const {
- return internal::try_catch( Rf_lang2( m_sexp, pairlist(t1, t2, t3, t4, t5, t6, t7) ) ) ;
+ return internal::try_catch( Rcpp_lcons( m_sexp, pairlist(t1, t2, t3, t4, t5, t6, t7) ) ) ;
}
template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8>
SEXP operator()(const T1& t1, const T2& t2, const T3& t3, const T4& t4, const T5& t5, const T6& t6, const T7& t7, const T8& t8) const {
- return internal::try_catch( Rf_lang2( m_sexp, pairlist(t1, t2, t3, t4, t5, t6, t7, t8) ) ) ;
+ return internal::try_catch( Rcpp_lcons( m_sexp, pairlist(t1, t2, t3, t4, t5, t6, t7, t8) ) ) ;
}
template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9>
SEXP operator()(const T1& t1, const T2& t2, const T3& t3, const T4& t4, const T5& t5, const T6& t6, const T7& t7, const T8& t8, const T9& t9) const {
- return internal::try_catch( Rf_lang2( m_sexp, pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9) ) ) ;
+ return internal::try_catch( Rcpp_lcons( m_sexp, pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9) ) ) ;
}
template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9, typename T10>
SEXP operator()(const T1& t1, const T2& t2, const T3& t3, const T4& t4, const T5& t5, const T6& t6, const T7& t7, const T8& t8, const T9& t9, const T10& t10) const {
- return internal::try_catch( Rf_lang2( m_sexp, pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10) ) ) ;
+ return internal::try_catch( Rcpp_lcons( m_sexp, pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10) ) ) ;
}
template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9, typename T10, typename T11>
SEXP operator()(const T1& t1, const T2& t2, const T3& t3, const T4& t4, const T5& t5, const T6& t6, const T7& t7, const T8& t8, const T9& t9, const T10& t10, const T11& t11) const {
- return internal::try_catch( Rf_lang2( m_sexp, pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11) ) ) ;
+ return internal::try_catch( Rcpp_lcons( m_sexp, pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11) ) ) ;
}
template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9, typename T10, typename T11, typename T12>
SEXP operator()(const T1& t1, const T2& t2, const T3& t3, const T4& t4, const T5& t5, const T6& t6, const T7& t7, const T8& t8, const T9& t9, const T10& t10, const T11& t11, const T12& t12) const {
- return internal::try_catch( Rf_lang2( m_sexp, pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12) ) ) ;
+ return internal::try_catch( Rcpp_lcons( m_sexp, pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12) ) ) ;
}
template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9, typename T10, typename T11, typename T12, typename T13>
SEXP operator()(const T1& t1, const T2& t2, const T3& t3, const T4& t4, const T5& t5, const T6& t6, const T7& t7, const T8& t8, const T9& t9, const T10& t10, const T11& t11, const T12& t12, const T13& t13) const {
- return internal::try_catch( Rf_lang2( m_sexp, pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13) ) ) ;
+ return internal::try_catch( Rcpp_lcons( m_sexp, pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13) ) ) ;
}
template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9, typename T10, typename T11, typename T12, typename T13, typename T14>
SEXP operator()(const T1& t1, const T2& t2, const T3& t3, const T4& t4, const T5& t5, const T6& t6, const T7& t7, const T8& t8, const T9& t9, const T10& t10, const T11& t11, const T12& t12, const T13& t13, const T14& t14) const {
- return internal::try_catch( Rf_lang2( m_sexp, pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14) ) ) ;
+ return internal::try_catch( Rcpp_lcons( m_sexp, pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14) ) ) ;
}
template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9, typename T10, typename T11, typename T12, typename T13, typename T14, typename T15>
SEXP operator()(const T1& t1, const T2& t2, const T3& t3, const T4& t4, const T5& t5, const T6& t6, const T7& t7, const T8& t8, const T9& t9, const T10& t10, const T11& t11, const T12& t12, const T13& t13, const T14& t14, const T15& t15) const {
- return internal::try_catch( Rf_lang2( m_sexp, pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15) ) ) ;
+ return internal::try_catch( Rcpp_lcons( m_sexp, pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15) ) ) ;
}
template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9, typename T10, typename T11, typename T12, typename T13, typename T14, typename T15, typename T16>
SEXP operator()(const T1& t1, const T2& t2, const T3& t3, const T4& t4, const T5& t5, const T6& t6, const T7& t7, const T8& t8, const T9& t9, const T10& t10, const T11& t11, const T12& t12, const T13& t13, const T14& t14, const T15& t15, const T16& t16) const {
- return internal::try_catch( Rf_lang2( m_sexp, pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16) ) ) ;
+ return internal::try_catch( Rcpp_lcons( m_sexp, pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16) ) ) ;
}
template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9, typename T10, typename T11, typename T12, typename T13, typename T14, typename T15, typename T16, typename T17>
SEXP operator()(const T1& t1, const T2& t2, const T3& t3, const T4& t4, const T5& t5, const T6& t6, const T7& t7, const T8& t8, const T9& t9, const T10& t10, const T11& t11, const T12& t12, const T13& t13, const T14& t14, const T15& t15, const T16& t16, const T17& t17) const {
- return internal::try_catch( Rf_lang2( m_sexp, pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17) ) ) ;
+ return internal::try_catch( Rcpp_lcons( m_sexp, pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17) ) ) ;
}
template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9, typename T10, typename T11, typename T12, typename T13, typename T14, typename T15, typename T16, typename T17, typename T18>
SEXP operator()(const T1& t1, const T2& t2, const T3& t3, const T4& t4, const T5& t5, const T6& t6, const T7& t7, const T8& t8, const T9& t9, const T10& t10, const T11& t11, const T12& t12, const T13& t13, const T14& t14, const T15& t15, const T16& t16, const T17& t17, const T18& t18) const {
- return internal::try_catch( Rf_lang2( m_sexp, pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18) ) ) ;
+ return internal::try_catch( Rcpp_lcons( m_sexp, pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18) ) ) ;
}
template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9, typename T10, typename T11, typename T12, typename T13, typename T14, typename T15, typename T16, typename T17, typename T18, typename T19>
SEXP operator()(const T1& t1, const T2& t2, const T3& t3, const T4& t4, const T5& t5, const T6& t6, const T7& t7, const T8& t8, const T9& t9, const T10& t10, const T11& t11, const T12& t12, const T13& t13, const T14& t14, const T15& t15, const T16& t16, const T17& t17, const T18& t18, const T19& t19) const {
- return internal::try_catch( Rf_lang2( m_sexp, pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19) ) ) ;
+ return internal::try_catch( Rcpp_lcons( m_sexp, pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19) ) ) ;
}
template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9, typename T10, typename T11, typename T12, typename T13, typename T14, typename T15, typename T16, typename T17, typename T18, typename T19, typename T20>
SEXP operator()(const T1& t1, const T2& t2, const T3& t3, const T4& t4, const T5& t5, const T6& t6, const T7& t7, const T8& t8, const T9& t9, const T10& t10, const T11& t11, const T12& t12, const T13& t13, const T14& t14, const T15& t15, const T16& t16, const T17& t17, const T18& t18, const T19& t19, const T20& t20) const {
- return internal::try_catch( Rf_lang2( m_sexp, pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19, t20) ) ) ;
+ return internal::try_catch( Rcpp_lcons( m_sexp, pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19, t20) ) ) ;
}
/* </code-bloat> */
More information about the Rcpp-commits
mailing list