Merge PR 587 by @dcdillon

Author: eddelbuettel

ChangeLog

@@ -10,12 +10,21 @@
         * inst/include/Rcpp/vector/Matrix.h: Protected Matrix op Scalar
         definitions with #ifndef RCPP_NO_SUGAR
 
+        * inst/include/Rcpp/date_datetime/newDateVector.h: Fixed the copy
+        constructor and added assignment operator.
+        * inst/include/Rcpp/date_datetime/newDatetimeVector.h: Fixed the copy
+        constructor and added assignment operator.
+        * inst/unitTests/cpp/dates.cpp: Added assignment operator tests for
+        DatetimeVector and DateVector for both new and old.
+        * inst/unitTests/runit.Date.R: Added assignment operator tests for
+        DatetimeVector and DateVector for both new and old.
+
 2016-11-10  Dirk Eddelbuettel  <[email protected]>
 
         * inst/include/Rcpp/date_datetime/newDateVector.h: Added constructor
         using VectorBase<>
 
-2016-01-05  Daniel C. Dillon  <[email protected]>
+2016-11-05  Daniel C. Dillon  <[email protected]>
 
         * inst/include/Rcpp/date_datetime/newDatetimeVector.h: Added constructor
         to instantiate newDatetimeVector from VectorBase.

inst/include/Rcpp/date_datetime/newDateVector.h

@@ -29,7 +29,9 @@ namespace Rcpp {
     class newDateVector : public NumericVector {
     public:
         template <int RTYPE, bool NA, typename VEC>
-        newDateVector(const VectorBase<RTYPE,NA,VEC>& vec) : NumericVector(vec) {}
+        newDateVector(const VectorBase<RTYPE,NA,VEC>& vec) : NumericVector(vec) {
+            setClass();
+        }
 
         newDateVector(SEXP vec) : NumericVector(vec) { setClass(); }
         newDateVector(int n) : NumericVector(n) { setClass(); }
@@ -41,6 +43,14 @@ namespace Rcpp {
                 v[i] = (*this)[i];
             return v;
         }
+        
+        inline newDateVector &operator=(const newDateVector &rhs) {
+            if (this != &rhs) {
+                NumericVector::operator=(rhs);
+            }
+            
+            return *this;
+        }
 
     private:
 

inst/include/Rcpp/date_datetime/newDatetimeVector.h

@@ -30,7 +30,9 @@ namespace Rcpp {
     public:
         template <int RTYPE, bool NA, typename VEC>
         newDatetimeVector(const VectorBase<RTYPE,NA,VEC>& other) :
-            NumericVector(other) {}
+            NumericVector(other) {
+                setClass(other.attr("tzone"));
+        }
 
         newDatetimeVector(SEXP vec, const char* tz = "") :
             NumericVector(vec) {
@@ -49,6 +51,15 @@ namespace Rcpp {
                 v[i] = (*this)[i];
             return v;
         }
+        
+        inline newDatetimeVector &operator=(const newDatetimeVector &rhs) {
+            if (this != &rhs) {
+                NumericVector::operator=(rhs);
+                this->attr("tzone") = rhs.attr("tzone");
+            }
+            
+            return *this;
+        }
 
     private:
 

inst/unitTests/cpp/dates.cpp

@@ -158,3 +158,17 @@ SEXP DatetimeVector_ctor(DatetimeVector d) {
     DatetimeVector dt = DatetimeVector(d);
     return wrap(dt);
 }
+
+// [[Rcpp::export]]
+DatetimeVector DatetimeVector_assignment(DatetimeVector v1,
+    DatetimeVector v2) {
+
+    v1 = v2;
+    return v1;
+}
+
+// [[Rcpp::export]]
+DateVector DateVector_assignment(DateVector v1, DateVector v2) {
+    v1 = v2;
+    return v1;
+}

inst/unitTests/runit.Date.R

@@ -181,5 +181,19 @@ if (.runThisTest) {
             checkEquals(fun(vec), c(now, rep(posixtNA, 3), now+2.345), msg = "Datetime.ctor.NA.NaN.Inf.set")
         }
     }
+    
+    test.DatetimeVector.assignment <- function() {
+        now <- Sys.time()
+        v1 <- c(now, now + 1, now + 2)
+        v2 <- c(now + 3, now + 4, now + 5)
+        checkEquals(v2, DatetimeVector_assignment(v1, v2))
+    }
+    
+    test.DateVector.assignment <- function() {
+        now <- Sys.Date()
+        v1 <- c(now, now + 1, now + 2)
+        v2 <- c(now + 3, now + 4, now + 5)
+        checkEquals(v2, DateVector_assignment(v1, v2))
+    }
 
 }