tag was wrongly set for Pairlist

Author: romainfrancois

inst/include/Rcpp/Pairlist.h

@@ -47,7 +47,6 @@ namespace Rcpp{
 
         void update(SEXP x){
             SET_TYPEOF( x, LISTSXP ) ;
-            SET_TAG( x, R_NilValue ) ;
         }
     } ;
 

inst/include/Rcpp/api/meat/DottedPairImpl.h

@@ -39,7 +39,7 @@ namespace Rcpp{
             while( !Rf_isNull(CDR(x)) ){
                 x = CDR(x) ;
             }
-            Shield<SEXP> tail( pairlist( object ) ); 
+            Shield<SEXP> tail( grow( object, R_NilValue ) ); 
             SETCDR( x, tail ) ;
         }
 	}

inst/include/Rcpp/grow.h

@@ -40,18 +40,18 @@ namespace Rcpp {
     namespace internal{
 
         template <typename T>
-    	inline SEXP grow__dispatch( ::Rcpp::traits::false_type, const T& head, SEXP tail ){
-    	    return grow( wrap(head), tail ) ;
-    	}
+        inline SEXP grow__dispatch( ::Rcpp::traits::false_type, const T& head, SEXP tail ){
+            return grow( wrap(head), tail ) ;
+        }
 
-    	template <typename T>
-    	inline SEXP grow__dispatch( ::Rcpp::traits::true_type, const T& head, SEXP tail ){
-    	    Shield<SEXP> y( wrap( head.object) ) ;
-    	    Shield<SEXP> x( Rf_cons( y , tail) ) ;
-    	    SEXP headNameSym = ::Rf_install( head.name.c_str() );
-    	    SET_TAG( x, headNameSym ); 
-    	    return x; 	
-    	}
+        template <typename T>
+        inline SEXP grow__dispatch( ::Rcpp::traits::true_type, const T& head, SEXP tail ){
+            Shield<SEXP> y( wrap( head.object) ) ;
+            Shield<SEXP> x( Rf_cons( y , tail) ) ;
+            SEXP headNameSym = ::Rf_install( head.name.c_str() );
+            SET_TAG( x, headNameSym ); 
+            return x; 	
+        }
 
     } // internal
 
@@ -68,25 +68,7 @@ namespace Rcpp {
         return grow( Rf_mkString(head), tail ) ; 
     }
 
-    
-#ifdef HAS_VARIADIC_TEMPLATES
-
-    /* end of the recursion, wrap first to make the CAR and use R_NilValue as the CDR of the list */
-    template<typename T>
-    SEXP pairlist( const T& first){
-        return grow(first, R_NilValue ); 
-    }
-
-    template<typename T, typename... Args>
-    SEXP pairlist( const T& first, const Args&... args ){
-        return grow(first, pairlist(args...) );
-    }
-
-#else
-
-#include <Rcpp/generated/grow__pairlist.h>
-
-#endif
+    #include <Rcpp/generated/grow__pairlist.h>
 
 } // namespace Rcpp
 

inst/unitTests/runit.Language.R

@@ -100,7 +100,7 @@ test.Language.in.env <- function(){
 
 test.Pairlist <- function(){
 	checkEquals( runit_pairlist( pairlist("rnorm") ), pairlist("rnorm" ), msg = "Pairlist( LISTSXP )" )
-	# checkEquals( runit_pairlist( call("rnorm") ), pairlist(as.name("rnorm")), msg = "Pairlist( LANGSXP )" )
+	checkEquals( runit_pairlist( call("rnorm") ), pairlist(as.name("rnorm")), msg = "Pairlist( LANGSXP )" )
 	checkEquals( runit_pairlist(1:10), as.pairlist(1:10) , msg = "Pairlist( INTSXP) " )
 	checkEquals( runit_pairlist(TRUE), as.pairlist( TRUE) , msg = "Pairlist( LGLSXP )" )
 	checkEquals( runit_pairlist(1.3), as.pairlist(1.3), msg = "Pairlist( REALSXP) " )