array(dim = {}) error msg says 'dim'

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

Author: maechler

doc/NEWS.Rd

@@ -452,6 +452,9 @@
       \item The implicitGeneric definition for \code{toeplitz()} produced a
       default method that failed when \code{toeplitz(x, r)} was called with
       more than the first argument.  Simple fix from \I{Mikael Jagan}.
+
+      \item The error message for \code{array(dim = c())} now uses
+      \code{"'dim'"}, thanks to \I{Hugo Gruson}.
     }
   }
 }

src/main/array.c

@@ -2144,11 +2144,8 @@ attribute_hidden SEXP do_colsum(SEXP call, SEXP op, SEXP args, SEXP rho)
 /* array(data, dim, dimnames) */
 attribute_hidden SEXP do_array(SEXP call, SEXP op, SEXP args, SEXP rho)
 {
-    SEXP vals, ans, dims, dimnames;
-    R_xlen_t lendat, i, nans;
-
     checkArity(op, args);
-    vals = CAR(args); // = data
+    SEXP vals = CAR(args); // = data
     /* at least NULL can get here */
     switch(TYPEOF(vals)) {
 	case LGLSXP:
@@ -2164,20 +2161,21 @@ attribute_hidden SEXP do_array(SEXP call, SEXP op, SEXP args, SEXP rho)
 	    error(_("'data' must be of a vector type, was '%s'"),
 		R_typeToChar(vals));
     }
-    lendat = XLENGTH(vals);
-    dims = CADR(args);
-    dimnames = CADDR(args);
+    SEXP ans,
+	dims     = CADR(args),
+	dimnames = CADDR(args);
     PROTECT(dims = coerceVector(dims, INTSXP));
     int nd = LENGTH(dims);
-    if (nd == 0) error(_("'dims' cannot be of length 0"));
+    if (nd == 0) error(_("'dim' cannot be of length 0"));
     double d = 1.0;
     for (int j = 0; j < nd; j++) d *= INTEGER(dims)[j];
 #ifdef LONG_VECTOR_SUPPORT
     if (d > R_XLEN_T_MAX) error(_("too many elements specified"));
 #else
     if (d > INT_MAX) error(_("too many elements specified"));
 #endif
-    nans = (R_xlen_t) d;
+    R_xlen_t lendat = XLENGTH(vals),
+	i, nans = (R_xlen_t) d;
 
     PROTECT(ans = allocVector(TYPEOF(vals), nans));
     switch(TYPEOF(vals)) {

tests/reg-tests-1e.R

@@ -2462,6 +2462,15 @@ x["a"] <- 100; chk1d(x)
 ## x["a"] <- .. did drop dim() & dimnames() {getting names() instead}.
 
 
+## error message when length(dim) == 0:
+(m1 <- tryCmsg(array(NULL )))
+(m2 <- tryCmsg(array(,NULL)))
+if(englishMsgs)
+  stopifnot(grepl(" was 'NULL'",   m1, fixed=TRUE),
+            grepl("'dim' cannot ", m2, fixed=TRUE))
+## had 'dims'
+
+
 
 ## keep at end
 rbind(last =  proc.time() - .pt,