Some more checking in the ChildVector class

Author: kevinushey

inst/include/Rcpp/vector/ChildVector.h

@@ -39,13 +39,30 @@ class ChildVector : public T {
 
     inline ChildVector& operator=(const ChildVector& other) {
         if (this != &other) {
-            SET_VECTOR_ELT(parent, i, other.get__());
+            this->set__(other);
+            if (parent != NULL && !Rf_isNull(parent)) {
+                SET_VECTOR_ELT(parent, i, other);
+            }
         }
         return *this;
     }
 
     inline ChildVector& operator=(const T& other) {
-        SET_VECTOR_ELT(parent, i, other);
+        this->set__(other);
+        if (parent != NULL && !Rf_isNull(parent)) {
+            SET_VECTOR_ELT(parent, i, other);
+        }
+        return *this;
+    }
+
+    template <typename U>
+    inline ChildVector& operator=(const U& other) {
+        Shield<SEXP> wrapped( wrap(other) );
+        T vec = as<T>(wrapped);
+        this->set__(vec);
+        if (parent != NULL && !Rf_isNull(parent)) {
+            SET_VECTOR_ELT(parent, i, vec);
+        }
         return *this;
     }
 

inst/unitTests/runit.ListOf.R

@@ -41,6 +41,7 @@ if (.runThisTest) {
     }
 
     test.ListOf.assign <- function() {
+        x <- list( c(1, 5), c(2, 6), c(3, 7) )
         test_assign(x, 100, "apple")
         checkIdentical( x[[2]], 100 )
     }