Merge pull request #1011 from RcppCore/feature/add_more_shields

Feature/add more shields

Author: eddelbuettel

ChangeLog

@@ -2,6 +2,10 @@
 
 	* DESCRIPTION (Version, Date): Roll minor version
 
+	* inst/include/Rcpp/Reference.h: Shield Rf_mkstring inside Rf_lang2
+	* inst/include/Rcpp/Environment.h: Idem (inside Rf_lang4)
+	* inst/include/Rcpp/proxy/FieldProxy.h: Idem (inside Rf_lang3 and 4)
+
 2019-10-31  Romain Francois  <[email protected]>
 
 	* inst/include/Rcpp/DataFrame.h: Protect temporaries from gc

inst/include/Rcpp/Environment.h

@@ -2,8 +2,8 @@
 //
 // Environment.h: Rcpp R/C++ interface class library -- access R environments
 //
-// Copyright (C) 2009 - 2013    Dirk Eddelbuettel and Romain Francois
-// Copyright (C) 2014           Dirk Eddelbuettel, Romain Francois and Kevin Ushey
+// Copyright (C) 2009 - 2013  Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2014 - 2019  Dirk Eddelbuettel, Romain Francois and Kevin Ushey
 //
 // This file is part of Rcpp.
 //
@@ -246,9 +246,8 @@ namespace Rcpp{
                        we have to go back to R to do this operation */
                     SEXP internalSym = Rf_install( ".Internal" );
                     SEXP removeSym = Rf_install( "remove" );
-                    Shield<SEXP> call( Rf_lang2(internalSym,
-                            Rf_lang4(removeSym, Rf_mkString(name.c_str()), Storage::get__(), Rf_ScalarLogical( FALSE ))
-                        ) );
+                    Shield<SEXP> str(Rf_mkString(name.c_str()));
+                    Shield<SEXP> call(Rf_lang2(internalSym, Rf_lang4(removeSym, str, Storage::get__(), Rf_ScalarLogical(FALSE))));
                     Rcpp_fast_eval( call, R_GlobalEnv ) ;
                 }
             } else{

inst/include/Rcpp/Reference.h

@@ -2,7 +2,7 @@
 //
 // Reference.h: Rcpp R/C++ interface class library -- Reference class objects
 //
-// Copyright (C) 2010 - 2015  Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2019  Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -58,7 +58,8 @@ namespace Rcpp{
          */
         Reference_Impl( const std::string& klass ) {
             SEXP newSym = Rf_install("new");
-            Shield<SEXP> call( Rf_lang2( newSym, Rf_mkString( klass.c_str() ) ) );
+            Shield<SEXP> str(Rf_mkString(klass.c_str()));
+            Shield<SEXP> call(Rf_lang2(newSym, str));
             Storage::set__( Rcpp_fast_eval( call , Rcpp::internal::get_Rcpp_namespace()) );
         }
 

inst/include/Rcpp/proxy/FieldProxy.h

@@ -41,12 +41,14 @@ class FieldProxyPolicy {
         const std::string& field_name ;
 
         SEXP get() const {
-            Shield<SEXP> call( Rf_lang3( R_DollarSymbol, parent, Rf_mkString(field_name.c_str()) ) ) ;
+            Shield<SEXP> str(Rf_mkString(field_name.c_str()));
+            Shield<SEXP> call(Rf_lang3(R_DollarSymbol, parent, str));
             return Rcpp_fast_eval( call, R_GlobalEnv ) ;
         }
         void set(SEXP x ) {
             SEXP dollarGetsSym = Rf_install( "$<-");
-            Shield<SEXP> call( Rf_lang4( dollarGetsSym, parent, Rf_mkString(field_name.c_str()) , x ) ) ;
+            Shield<SEXP> str(Rf_mkString(field_name.c_str()));
+            Shield<SEXP> call(Rf_lang4(dollarGetsSym, parent, str, x));
             parent.set__( Rcpp_fast_eval( call, R_GlobalEnv ) );
         }
     } ;
@@ -66,7 +68,8 @@ class FieldProxyPolicy {
         const std::string& field_name ;
 
         SEXP get() const {
-            Shield<SEXP> call( Rf_lang3( R_DollarSymbol, parent, Rf_mkString(field_name.c_str()) ) ) ;
+            Shield<SEXP> str(Rf_mkString(field_name.c_str()));
+            Shield<SEXP> call(Rf_lang3(R_DollarSymbol, parent, str));
             return Rcpp_fast_eval( call, R_GlobalEnv ) ;
         }
     } ;