Skip to content

safer Function<>::operator(), Rcpp_list*(), Rcpp_lang*() #1014

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 10, 2019
Merged

safer Function<>::operator(), Rcpp_list*(), Rcpp_lang*() #1014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d65f3c0
ensafe Rcpp_list* and Rcpp_lang*, based on how Rf_list* and Rf_lang* …
romainfrancois Nov 8, 2019
c87e4de
Function.invoke() to help operator()
romainfrancois Nov 8, 2019
3af5556
safer Function.operator() based on Function.invoke()
romainfrancois Nov 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions inst/include/Rcpp/Function.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,14 @@ namespace Rcpp{
Shield<SEXP> x( Rf_findFun( nameSym, env ) ) ;
Storage::set__(x) ;
}

SEXP invoke(SEXP args_, SEXP env) const {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a private support function to make operator() easier to write.

Shield<SEXP> args(args_);
Shield<SEXP> call(Rcpp_lcons(Storage::get__(), args));
SEXP out = Rcpp_fast_eval(call, env);
return out;
}

};

typedef Function_Impl<PreserveStorage> Function ;
Expand Down
42 changes: 21 additions & 21 deletions inst/include/Rcpp/generated/Function__operator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,108 +26,108 @@

template <TYPENAMES>
SEXP operator()(ARGUMENTS){
return Rcpp_fast_eval(Rf_lang2(Storage::get__(), pairlist(PARAMETERS)), R_GlobalEnv);
return invoke(pairlist(PARAMETERS), R_GlobalEnv);
}

*/
template <typename T1>
SEXP operator()(const T1& t1) const {
return Rcpp_fast_eval(Rcpp_lcons(Storage::get__(), pairlist(t1)), R_GlobalEnv);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the result of pairlist() was not protected, and Rcpp_lcons() allocates, so it might gc() it.
the result of Rcpp_lcons() is not protected, so it might be claimed when Rcpp_fast_eval() allocates ...

all changes in that file are the same.

return invoke(pairlist(t1), R_GlobalEnv);
}

template <typename T1, typename T2>
SEXP operator()(const T1& t1, const T2& t2) const {
return Rcpp_fast_eval(Rcpp_lcons(Storage::get__(), pairlist(t1, t2)), R_GlobalEnv);
return invoke(pairlist(t1, t2), R_GlobalEnv);
}

template <typename T1, typename T2, typename T3>
SEXP operator()(const T1& t1, const T2& t2, const T3& t3) const {
return Rcpp_fast_eval(Rcpp_lcons(Storage::get__(), pairlist(t1, t2, t3)), R_GlobalEnv);
return invoke(pairlist(t1, t2, t3), R_GlobalEnv);
}

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 Rcpp_fast_eval(Rcpp_lcons(Storage::get__(), pairlist(t1, t2, t3, t4)), R_GlobalEnv);
return invoke(pairlist(t1, t2, t3, t4), R_GlobalEnv);
}

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 Rcpp_fast_eval(Rcpp_lcons(Storage::get__(), pairlist(t1, t2, t3, t4, t5)), R_GlobalEnv);
return invoke(pairlist(t1, t2, t3, t4, t5), R_GlobalEnv);
}

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 Rcpp_fast_eval(Rcpp_lcons(Storage::get__(), pairlist(t1, t2, t3, t4, t5, t6)), R_GlobalEnv);
return invoke(pairlist(t1, t2, t3, t4, t5, t6), R_GlobalEnv);
}

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 Rcpp_fast_eval(Rcpp_lcons(Storage::get__(), pairlist(t1, t2, t3, t4, t5, t6, t7)), R_GlobalEnv);
return invoke(pairlist(t1, t2, t3, t4, t5, t6, t7), R_GlobalEnv);
}

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 Rcpp_fast_eval(Rcpp_lcons(Storage::get__(), pairlist(t1, t2, t3, t4, t5, t6, t7, t8)), R_GlobalEnv);
return invoke(pairlist(t1, t2, t3, t4, t5, t6, t7, t8), R_GlobalEnv);
}

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 Rcpp_fast_eval(Rcpp_lcons(Storage::get__(), pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9)), R_GlobalEnv);
return invoke(pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9), R_GlobalEnv);
}

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 Rcpp_fast_eval(Rcpp_lcons(Storage::get__(), pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10)), R_GlobalEnv);
return invoke(pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10), R_GlobalEnv);
}

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 Rcpp_fast_eval(Rcpp_lcons(Storage::get__(), pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11)), R_GlobalEnv);
return invoke(pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11), R_GlobalEnv);
}

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 Rcpp_fast_eval(Rcpp_lcons(Storage::get__(), pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12)), R_GlobalEnv);
return invoke(pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12), R_GlobalEnv);
}

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 Rcpp_fast_eval(Rcpp_lcons(Storage::get__(), pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13)), R_GlobalEnv);
return invoke(pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13), R_GlobalEnv);
}

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 Rcpp_fast_eval(Rcpp_lcons(Storage::get__(), pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14)), R_GlobalEnv);
return invoke(pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14), R_GlobalEnv);
}

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 Rcpp_fast_eval(Rcpp_lcons(Storage::get__(), pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15)), R_GlobalEnv);
return invoke(pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15), R_GlobalEnv);
}

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 Rcpp_fast_eval(Rcpp_lcons(Storage::get__(), pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16)), R_GlobalEnv);
return invoke(pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16), R_GlobalEnv);
}

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 Rcpp_fast_eval(Rcpp_lcons(Storage::get__(), pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17)), R_GlobalEnv);
return invoke(pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17), R_GlobalEnv);
}

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 Rcpp_fast_eval(Rcpp_lcons(Storage::get__(), pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18)), R_GlobalEnv);
return invoke(pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18), R_GlobalEnv);
}

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 Rcpp_fast_eval(Rcpp_lcons(Storage::get__(), pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19)), R_GlobalEnv);
return invoke(pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19), R_GlobalEnv);
}

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 Rcpp_fast_eval(Rcpp_lcons(Storage::get__(), pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19, t20)), R_GlobalEnv);
return invoke(pairlist(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19, t20), R_GlobalEnv);
}

/* </code-bloat> */
Expand Down
Loading