Disable comma initialization (hide it behind #define); update unit tests

Author: kevinushey

inst/NEWS.Rd

@@ -26,6 +26,14 @@
       \code{IntegerVector}s (0-based index subsetting). Such subsetting
       will also work with Rcpp sugar expressions, enabling expressions
       such as \code{x[ x > 0]}.
+      \item Comma initialization (e.g. 
+      \code{CharacterVector x = "a", "b", "c";}, has been disabled, as
+      it causes problems with the behavior of the \code{=} operator with
+      \code{Rcpp::List}s. Users who want to re-enable this functionality 
+      can use \code{#define RCPP_COMMA_INITIALIZATION}, but be aware of
+      the above caveat. The more verbose 
+      \code{CharacterVector x = CharacterVector::create("a", "b", "c")}
+      is preferred.
     }
     \item Changes in Rcpp Attributes
     \itemize{

inst/include/Rcpp/vector/Vector.h

@@ -213,10 +213,12 @@ class Vector :
         return traits::is_na<RTYPE>(x); 
     }
 
+    #ifdef RCPP_COMMA_INITIALIZATION
     internal::ListInitialization<iterator,init_type> operator=( init_type x){
         iterator start = begin() ; *start = x; 
         return internal::ListInitialization<iterator,init_type>( start + 1 ) ; ;
     }
+    #endif
 
     /**
      * the length of the vector, uses Rf_length

inst/unitTests/cpp/Vector.cpp

@@ -186,13 +186,6 @@ int integer_names_indexing( IntegerVector y ){
     return y["foo"] ;
 }
 
-// [[Rcpp::export]]
-IntegerVector integer_comma(){
-    IntegerVector x(4) ;
-	x = 0, 1, 2, 3 ;
-	return x ;
-}
-
 // [[Rcpp::export]]
 IntegerVector integer_push_back( IntegerVector y ){
     y.push_back( 5 ) ;
@@ -599,13 +592,6 @@ std::string character_names_indexing( CharacterVector y ){
     return foo ;
 }
 
-// [[Rcpp::export]]
-CharacterVector character_comma(){
-    CharacterVector x(3) ;
-    x = "foo", "bar", "bling" ;
-    return x ;
-}
-
 // [[Rcpp::export]]
 List character_listOf( List ll ){
     CharacterVector cv1 = ll["foo"];
@@ -757,3 +743,10 @@ CharacterVector sort_character(CharacterVector x) {
 LogicalVector sort_logical(LogicalVector x) {
   return x.sort();
 }
+
+// [[Rcpp::export]]
+List list_sexp_assign(SEXP x) {
+    List L;
+    L = x;
+    return L;
+}

inst/unitTests/cpp/VectorOld.cpp

@@ -0,0 +1,38 @@
+// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
+//
+// Vector-old.cpp: Rcpp R/C++ interface class library -- Vector unit tests
+//
+// Copyright (C) 2014    Dirk Eddelbuettel, Romain Francois and Kevin Ushey
+//
+// This file is part of Rcpp.
+//
+// Rcpp is free software: you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+//
+// Rcpp is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
+
+#define RCPP_COMMA_INITIALIZATION
+#include <Rcpp.h>
+using namespace Rcpp;
+
+// [[Rcpp::export]]
+IntegerVector integer_comma(){
+    IntegerVector x(4) ;
+    x = 0, 1, 2, 3 ;
+    return x ;
+}
+
+// [[Rcpp::export]]
+CharacterVector character_comma(){
+    CharacterVector x(3) ;
+    x = "foo", "bar", "bling" ;
+    return x ;
+}

inst/unitTests/runit.Vector.R

@@ -152,11 +152,6 @@ if (.runThisTest) {
         checkEquals( fun( x ), 1L, msg = "IntegerVector names based indexing" )
     }
 
-    test.IntegerVector.comma <- function(){
-        fun <- integer_comma
-        checkEquals( fun(), 0:3, msg = "IntegerVector comma initialization" )
-    }
-
     test.IntegerVector.push.back <- function(){
         fun <- integer_push_back
         checkEquals( fun(1:4), 1:5, msg = "IntegerVector push back" )
@@ -520,11 +515,6 @@ if (.runThisTest) {
         checkEquals( fun(x), "foo", msg = "CharacterVector names based indexing" )
     }
 
-    test.CharacterVector.comma <- function(){
-        fun <- character_comma
-        checkEquals( fun(), c("foo","bar", "bling" ), msg = "CharacterVector comma operator" )
-    }
-
     test.CharacterVector.listOf <- function() {
         fun <- character_listOf
         checkEquals(fun(list(foo=c("tic","tac","toe"),
@@ -669,5 +659,12 @@ if (.runThisTest) {
         lgcl <- as.logical(int)
         checkIdentical( sort_logical(lgcl), sort(lgcl, na.last=TRUE) )
     }
+    
+    test.List.assign.SEXP <- function() {
+        l <- list(1, 2, 3)
+        other <- list_sexp_assign(l)
+        checkIdentical(l, other)
+    }
+    
 }
 

inst/unitTests/runit.VectorOld.R

@@ -0,0 +1,34 @@
+# Copyright (C) 2014  Dirk Eddelbuettel, Romain Francois and Kevin Ushey
+#
+# This file is part of Rcpp.
+#
+# Rcpp is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# Rcpp is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
+
+.runThisTest <- Sys.getenv("RunAllRcppTests") == "yes"
+
+if (.runThisTest) {
+    
+    .setUp <- Rcpp:::unitTestSetup("VectorOld.cpp")
+    
+    test.IntegerVector.comma <- function(){
+        fun <- integer_comma
+        checkEquals( fun(), 0:3, msg = "IntegerVector comma initialization" )
+    }
+    
+    test.CharacterVector.comma <- function(){
+        fun <- character_comma
+        checkEquals( fun(), c("foo","bar", "bling" ), msg = "CharacterVector comma operator" )
+    }
+    
+}