Drop dim and dimnames attributes when extending a GROWABLE vector in place.

git-svn-id: https://svn.r-project.org/R/trunk@89031 00db46b3-68df-0310-9c12-caf00c1e9a41

Author: luke

src/main/subassign.c

@@ -162,11 +162,17 @@ static SEXP EnlargeVector(SEXP x, R_xlen_t newlen)
 	IS_GROWABLE(x) &&
 	XTRUELENGTH(x) >= newlen) {
 	SET_STDVEC_LENGTH(x, newlen);
-	names = getNames(x);
-	if (!isNull(names)) {
-	    SEXP newnames = EnlargeNames(names, len, newlen);
-	    if (names != newnames)
-		setAttrib(x, R_NamesSymbol, newnames);
+	if (ATTRIB(x) != R_NilValue) {
+	    names = getNames(x);
+	    if (!isNull(names)) {
+		SEXP newnames = EnlargeNames(names, len, newlen);
+		if (names != newnames)
+		    setAttrib(x, R_NamesSymbol, newnames);
+	    }
+	    if (getAttrib(x, R_DimSymbol) != R_NilValue)
+		setAttrib(x, R_DimSymbol, R_NilValue);
+	    if (getAttrib(x, R_DimNamesSymbol) != R_NilValue)
+		setAttrib(x, R_DimNamesSymbol, R_NilValue);
 	}
 	return x;
     }

tests/reg-tests-1e.R

@@ -2342,6 +2342,15 @@ stopifnot(exprs = { ## logical/numeric mixtures:
     }
 })
 
+## check that tim and dimnames are dropped when estending with GROWABLE
+x <- 1:49
+x[50] <- 50L
+dim(x) <- c(25, 2)
+dimnames(x) <- list(NULL, c("a", "b"))
+a <- .Internal(address(x))
+x[51] <- 51L
+stopifnot(identical(a, .Internal(address(x)))) ## reused x
+stopifnot(is.null(attributes(x))) ## dim and dimnames have been dropped
 
 
 ## keep at end