Skip to content

AttributeProxy::set() #947

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 7 commits into from
Mar 16, 2019
Merged

AttributeProxy::set() #947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8908a36
AttributeProxy::set() fix
romainfrancois Mar 12, 2019
041c1db
no need to Shield<> in meat
romainfrancois Mar 12, 2019
41944d4
slightly nicer to inline Shield<>
romainfrancois Mar 12, 2019
573ee50
Vector(SEXP) needs to protect `x` because `r_cast()` allocates.
romainfrancois Mar 13, 2019
870df2e
safer NameProxy::set(). rchk.
romainfrancois Mar 13, 2019
76b92d2
safer clone<>
romainfrancois Mar 13, 2019
24665ca
safer Vector ctors with various Shield<SEXP>
romainfrancois Mar 13, 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
2 changes: 1 addition & 1 deletion inst/include/Rcpp/api/meat/proxy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ template <typename CLASS>
template <typename T>
typename AttributeProxyPolicy<CLASS>::AttributeProxy&
AttributeProxyPolicy<CLASS>::AttributeProxy::operator=(const T& rhs) {
set(Shield<SEXP>(wrap(rhs)));
set(wrap(rhs));
return *this;
}

Expand Down
5 changes: 3 additions & 2 deletions inst/include/Rcpp/clone.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@ namespace Rcpp{
- T has a SEXP constructor
*/
template <typename T> T clone(const T& object) {
SEXP x = const_cast<T&>(object) ;
return T( Rf_duplicate( x ) ) ;
Shield<SEXP> x(const_cast<T&>(object));
Shield<SEXP> copy(Rf_duplicate(x));
return T((SEXP)copy);
}

} // namespace Rcpp
Expand Down
2 changes: 1 addition & 1 deletion inst/include/Rcpp/proxy/AttributeProxy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class AttributeProxyPolicy {
return Rf_getAttrib( parent, attr_name ) ;
}
void set(SEXP x ){
Rf_setAttrib( parent, attr_name, x ) ;
Rf_setAttrib( parent, attr_name, Shield<SEXP>(x) ) ;
}
} ;

Expand Down
8 changes: 5 additions & 3 deletions inst/include/Rcpp/proxy/NamesProxy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,16 @@ class NamesProxyPolicy{
}

void set(SEXP x) {
Shield<SEXP> safe_x(x);

/* check if we can use a fast version */
if( TYPEOF(x) == STRSXP && parent.size() == Rf_length(x) ){
SEXP y = parent.get__() ;
Rf_setAttrib( y, R_NamesSymbol, x ) ;
Rf_namesgets(parent, x);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

That's what Rf_namesgets is for.

} else {
/* use the slower and more flexible version (callback to R) */
SEXP namesSym = Rf_install( "names<-" );
Shield<SEXP> new_vec(Rcpp_fast_eval(Rf_lang3(namesSym, parent, x), R_GlobalEnv));
Shield<SEXP> call(Rf_lang3(namesSym, parent, x));
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Was unsafe to not protect the result of Rf_lang3

Shield<SEXP> new_vec(Rcpp_fast_eval(call, R_GlobalEnv));
parent.set__(new_vec);
}

Expand Down
2 changes: 1 addition & 1 deletion inst/include/Rcpp/vector/Matrix.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class Matrix : public Vector<RTYPE, StoragePolicy>, public MatrixBase<RTYPE, tru

Matrix() : VECTOR(Dimension(0, 0)), nrows(0) {}

Matrix(SEXP x) : VECTOR( r_cast<RTYPE>( x ) ), nrows( VECTOR::dims()[0] ) {}
Matrix(SEXP x) : VECTOR(x), nrows( VECTOR::dims()[0] ) {}

Matrix( const Dimension& dims) : VECTOR( Rf_allocMatrix( RTYPE, dims[0], dims[1] ) ), nrows(dims[0]) {
if( dims.size() != 2 ) throw not_a_matrix();
Expand Down
9 changes: 6 additions & 3 deletions inst/include/Rcpp/vector/Vector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,14 @@ class Vector :
}

Vector( SEXP x ) {
Storage::set__( r_cast<RTYPE>(x) ) ;
Rcpp::Shield<SEXP> safe(x);
Storage::set__( r_cast<RTYPE>(safe) ) ;
}

template <typename Proxy>
Vector( const GenericProxy<Proxy>& proxy ){
Storage::set__( r_cast<RTYPE>(proxy.get()) ) ;
Rcpp::Shield<SEXP> safe(proxy.get());
Storage::set__( r_cast<RTYPE>(safe) ) ;
}

explicit Vector( const no_init_vector& obj) {
Expand Down Expand Up @@ -174,7 +176,8 @@ class Vector :

template <bool NA, typename T>
Vector( const sugar::SingleLogicalResult<NA,T>& obj ) {
Storage::set__( r_cast<RTYPE>( const_cast<sugar::SingleLogicalResult<NA,T>&>(obj).get_sexp() ) ) ;
Rcpp::Shield<SEXP> safe(const_cast<sugar::SingleLogicalResult<NA,T>&>(obj).get_sexp() );
Storage::set__( r_cast<RTYPE>(safe) ) ;
RCPP_DEBUG_2( "Vector<%d>( const sugar::SingleLogicalResult<NA,T>& ) [T = %s]", RTYPE, DEMANGLE(T) )
}

Expand Down