Merge branch 'master' of github.com:RcppCore/Rcpp

Author: eddelbuettel

.gitignore

@@ -1,5 +1,4 @@
 inst/lib
-*.Rproj
 .Rproj.user
 src/*.o
 src/*.so
@@ -9,4 +8,4 @@ src/*.dll
 ## QtCreator
 Rcpp.pro
 Rcpp.pro.user
-*.autosave
+*.autosave

ChangeLog

@@ -1,3 +1,10 @@
+2014-05-18  Kevin Ushey  <[email protected]>
+
+	* inst/include/Rcpp/vector/Vector.h: Safer casting to fix #146
+	* inst/include/Rcpp/Environment.h: Idem
+	* inst/include/Rcpp/api/meat/Environment.h: Idem
+	* inst/include/Rcpp/vector/Vector.h: Idem
+
 2014-05-10  Dirk Eddelbuettel  <[email protected]>
 
 	* R/Attributes.R (compileAttributes): Read Imports: as well

Rcpp.Rproj

@@ -0,0 +1,20 @@
+Version: 1.0
+
+RestoreWorkspace: Default
+SaveWorkspace: Default
+AlwaysSaveHistory: Default
+
+EnableCodeIndexing: Yes
+UseSpacesForTab: Yes
+NumSpacesForTab: 4
+Encoding: UTF-8
+
+RnwWeave: knitr
+LaTeX: pdfLaTeX
+
+AutoAppendNewline: Yes
+StripTrailingWhitespace: Yes
+
+BuildType: Package
+PackageUseDevtools: Yes
+PackageInstallArgs: --no-multiarch --with-keep.source

inst/include/Rcpp/Date.h

@@ -25,7 +25,7 @@
 namespace Rcpp {
 
     class Date {
-    public:	
+    public:
         Date(){
             m_d = 0;
             update_tm();
@@ -64,7 +64,7 @@ namespace Rcpp {
         }
 
         ~Date() {};
-    	
+
         	double getDate(void) const {
         	   return m_d;
         	}
@@ -97,13 +97,13 @@ namespace Rcpp {
         inline int is_na() const {
            return traits::is_na<REALSXP>( m_d ) ;
         }
-    	
+
     private:
         double m_d;					// (fractional) day number, relative to epoch of Jan 1, 1970
         struct tm m_tm;				// standard time representation
 
         // update m_tm based on m_d
-        void update_tm(){			
+        void update_tm(){
             if (R_FINITE(m_d)) {
                 time_t t = 24*60*60 * m_d;		// (fractional) days since epoch to seconds since epoch
                 m_tm = *gmtime_(&t);
@@ -161,7 +161,7 @@ namespace Rcpp {
         inline SEXP new_posixt_object( double d){
             Shield<SEXP> x( Rf_ScalarReal( d ) ) ;
             Rf_setAttrib(x, R_ClassSymbol, getPosixClasses() );
-            return x ;	
+            return x ;
         }
 
         inline SEXP new_date_object( double d){
@@ -172,7 +172,7 @@ namespace Rcpp {
 
     }
 
-    	
+
 }
 
 #endif

inst/include/Rcpp/Datetime.h

@@ -27,20 +27,20 @@
 namespace Rcpp {
 
     class Datetime {
-    public:	
+    public:
 		Datetime() {
 		    m_dt = 0;
 		    update_tm();
 		}
 		Datetime(SEXP s);
-		
+
 		// from double, just like POSIXct
 		Datetime(const double &dt){
 		    m_dt = dt;
 		    update_tm();
 		}
 		Datetime(const std::string &s, const std::string &fmt="%Y-%m-%d %H:%M:%OS");
-		
+
 		double getFractionalTimestamp(void) const { return m_dt; }
 
 		int getMicroSeconds() const { return m_us; }
@@ -64,7 +64,7 @@ namespace Rcpp {
 		friend bool      operator!=(const Datetime &dt1, const Datetime& dt2);
 
 		inline int is_na() const { return traits::is_na<REALSXP>( m_dt ) ; }
-		
+
     private:
         double m_dt;				// fractional seconds since epoch
         struct tm m_tm;			// standard time representation
@@ -73,17 +73,17 @@ namespace Rcpp {
         // update m_tm based on m_dt
         void update_tm() {
             if (R_FINITE(m_dt)) {
-                time_t t = static_cast<time_t>(std::floor(m_dt));	
+                time_t t = static_cast<time_t>(std::floor(m_dt));
                 m_tm = *gmtime_(&t);
                 // m_us is fractional (micro)secs as diff. between (fractional) m_dt and m_tm
-                m_us = static_cast<int>(::Rf_fround( (m_dt - t) * 1.0e6, 0.0));	
+                m_us = static_cast<int>(::Rf_fround( (m_dt - t) * 1.0e6, 0.0));
             } else {
                 m_dt = NA_REAL;			// NaN and Inf need it set
                 m_tm.tm_sec = m_tm.tm_min = m_tm.tm_hour = m_tm.tm_isdst = NA_INTEGER;
                 m_tm.tm_min = m_tm.tm_hour = m_tm.tm_mday = m_tm.tm_mon  = m_tm.tm_year = NA_INTEGER;
             	   m_us = NA_INTEGER;
             }
-        }		
+        }
 
     };
 
@@ -102,13 +102,13 @@ namespace Rcpp {
     }
 
     template<> SEXP wrap_extra_steps<Rcpp::Datetime>( SEXP x ) ;
-	
+
     inline Datetime operator+(const Datetime &datetime, double offset) {
 		Datetime newdt(datetime.m_dt);
 		newdt.m_dt += offset;
-		time_t t = static_cast<time_t>(std::floor(newdt.m_dt));	
-		newdt.m_tm = *gmtime_(&t);		
-		newdt.m_us = static_cast<int>(::Rf_fround( (newdt.m_dt - t) * 1.0e6, 0.0));	
+		time_t t = static_cast<time_t>(std::floor(newdt.m_dt));
+		newdt.m_tm = *gmtime_(&t);
+		newdt.m_us = static_cast<int>(::Rf_fround( (newdt.m_dt - t) * 1.0e6, 0.0));
 		return newdt;
     }
 

inst/include/Rcpp/Dimension.h

@@ -28,11 +28,11 @@ namespace Rcpp{
     public:
 	    typedef std::vector<int>::reference reference ;
 	    typedef std::vector<int>::const_reference const_reference ;
-	
+
 	    Dimension() : dims(){}
-	
+
 	    Dimension(SEXP dims) ;
-	
+
 	    Dimension( const Dimension& other ) : dims(other.dims){}
 	    Dimension& operator=( const Dimension& other ) {
 	        if( *this != other )
@@ -52,14 +52,14 @@ namespace Rcpp{
 	        dims[2] = n3 ;
 	    }
 	    operator SEXP() const ;
-	
+
 	    inline int size() const {
 	        return (int) dims.size() ;
 	    }
 	    inline int prod() const {
 	        return std::accumulate( dims.begin(), dims.end(), 1, std::multiplies<int>() ) ;
 	    }
-	
+
 	    inline reference operator[](int i){
 	        if( i < 0 || i>=static_cast<int>(dims.size()) ) throw std::range_error("index out of bounds") ;
             return dims[i] ;
@@ -68,7 +68,7 @@ namespace Rcpp{
 	        if( i < 0 || i>=static_cast<int>(dims.size()) ) throw std::range_error("index out of bounds") ;
 	        return dims[i] ;
 	    }
-	
+
 	private:
 	    std::vector<int> dims;
     };

inst/include/Rcpp/DottedPair.h

@@ -31,15 +31,15 @@ RCPP_API_CLASS(DottedPair_Impl),
     RCPP_GENERATE_CTOR_ASSIGN(DottedPair_Impl)
 
 	DottedPair_Impl(){}
-	
+
 	DottedPair_Impl(SEXP x) {
 	    Storage::set__(x) ;
 	}
-	
+
 	#include <Rcpp/generated/DottedPair__ctors.h>
 
 	void update(SEXP){}
-	
+
 };
 
 typedef DottedPair_Impl<PreserveStorage> DottedPair ;

inst/include/Rcpp/DottedPairImpl.h

@@ -77,19 +77,19 @@ namespace Rcpp{
          * @param index position where the element is to be removed
          */
         void remove( const size_t& index );
-	
+
         template <typename T>
 	    friend DottedPairImpl& operator<<(DottedPairImpl& os, const T& t){
 	        os.push_back( t ) ;
 	        return os ;
 	    }
-	
+
 	    template <typename T>
 	    friend DottedPairImpl& operator>>( const T& t, DottedPairImpl& s){
 	        s.push_front(t);
 	        return s ;
 	    }
-	
+
     } ;
 
 }

inst/include/Rcpp/Environment.h

@@ -52,7 +52,8 @@ namespace Rcpp{
          * if the SEXP is not an environment, and exception is thrown
          */
         Environment_Impl(SEXP x) {
-            Storage::set__( as_environment(x) ) ;
+            Shield<SEXP> env(as_environment(x));
+            Storage::set__(env) ;
         }
 
         /**

inst/include/Rcpp/InternalFunction.h

@@ -33,16 +33,16 @@ namespace Rcpp{
 
         RCPP_GENERATE_CTOR_ASSIGN(InternalFunction_Impl)
 
-        #include <Rcpp/generated/InternalFunction__ctors.h>	
-    		
+        #include <Rcpp/generated/InternalFunction__ctors.h>
+
     private:
-    	
+
         inline void set( SEXP xp){
             Environment RCPP = Environment::Rcpp_namespace() ;
             Function intf = RCPP["internal_function"] ;
             Storage::set__( intf( xp ) ) ;
         }
-    	
+
     };
 
     typedef InternalFunction_Impl<PreserveStorage> InternalFunction ;