The R Project SVN R

Rev

Rev 47049 | Rev 48092 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 47049 Rev 48062
Line 289... Line 289...
289 
	}
 289 
	}
290 
	PROTECT(newnames);
 290 
	PROTECT(newnames);
291 
	setAttrib(x, R_DimNamesSymbol, R_NilValue);
 291 
	setAttrib(x, R_DimNamesSymbol, R_NilValue);
292 
	setAttrib(x, R_DimSymbol, R_NilValue);
 292 
	setAttrib(x, R_DimSymbol, R_NilValue);
293 
	setAttrib(x, R_NamesSymbol, newnames);
 293 
	setAttrib(x, R_NamesSymbol, newnames);
- 
 
 294 
	/* FIXME: the following is desirable, but pointless as long as
- 
 
 295 
	   subset.c & others have a contrary version that leaves the
- 
 
 296 
	   S4 class in, incorrectly, in the case of vectors.  JMC
- 
 
 297 
	   3/3/09 */
- 
 
 298 
/* 	if(IS_S4_OBJECT(x)) {/\* no longer valid subclass of array or
- 
 
 299 
 	matrix *\/ */
- 
 
 300 
/* 	    setAttrib(x, R_ClassSymbol, R_NilValue); */
- 
 
 301 
/* 	    UNSET_S4_OBJECT(x); */
- 
 
 302 
/* 	} */
294 
	UNPROTECT(1);
 303 
	UNPROTECT(1);
295 
    } else {
 304 
    } else {
296 
	/* We have a lower dimensional array. */
 305 
	/* We have a lower dimensional array. */
297 
	SEXP newdims, dnn, newnamesnames = R_NilValue;
 306 
	SEXP newdims, dnn, newnamesnames = R_NilValue;
298 
	dnn = getAttrib(dimnames, R_NamesSymbol);
 307 
	dnn = getAttrib(dimnames, R_NamesSymbol);