The R Project SVN – R – Diff – /trunk/src/main/array.c

 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 1998-2017   The R Core Team
+ *  Copyright (C) 1998-2018   The R Core Team
  *  Copyright (C) 2002-2015   The R Foundation
  *  Copyright (C) 1995, 1996  Robert Gentleman and Ross Ihaka
+ *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
     if (nrow < 0 || ncol < 0 || nface < 0)
 	error(_("negative extents to 3D array"));
 #ifndef LONG_VECTOR_SUPPORT
     if ((double)nrow * (double)ncol * (double)nface > INT_MAX)
-	error(_("'alloc3Darray': too many elements specified"));
+	error(_("'alloc3DArray': too many elements specified"));
 #endif
     n = ((R_xlen_t) nrow) * ncol * nface;
     PROTECT(s = allocVector(mode, n));
     PROTECT(t = allocVector(INTSXP, 3));
     INTEGER(t)[0] = nrow;
     int i;
     R_xlen_t n = 1;
     double dn = 1;
     for (i = 0; i < LENGTH(dims); i++) {
-	dn *= INTEGER(dims)[i];
 #ifndef LONG_VECTOR_SUPPORT
+	dn *= INTEGER(dims)[i];
 	if(dn > INT_MAX)
 	    error(_("'allocArray': too many elements specified by 'dims'"));
 #endif
 	n *= INTEGER(dims)[i];
+    }
     return ans;
+}
 SEXP attribute_hidden do_rowscols(SEXP call, SEXP op, SEXP args, SEXP rho)
+{
-    SEXP x, ans;
-    int i, j, nr, nc;
     checkArity(op, args);
-    /* This is the dimensions vector */
+    SEXP dim = CAR(args);
-    x = CAR(args);
+    int nprot = 0;
-    if (!isInteger(x) || LENGTH(x) != 2)
+    if (!isInteger(dim)) {
+	PROTECT(dim = coerceVector(dim, INTSXP)); nprot++;
+    }
+    if (LENGTH(dim) != 2)
 	error(_("a matrix-like object is required as argument to '%s'"),
 	      (PRIMVAL(op) == 2) ? "col" : "row");
-    nr = INTEGER(x)[0];
+    int nr = INTEGER(dim)[0],
-    nc = INTEGER(x)[1];
+	nc = INTEGER(dim)[1];
+    if(nprot) UNPROTECT(nprot);
-    ans = allocMatrix(INTSXP, nr, nc);
+    SEXP ans = allocMatrix(INTSXP, nr, nc);
     R_xlen_t NR = nr;
     switch (PRIMVAL(op)) {
-    case 1:
+    case 1: // row() & .row()
-	for (i = 0; i < nr; i++)
+	for (int i = 0; i < nr; i++)
-	    for (j = 0; j < nc; j++)
+	    for (int j = 0; j < nc; j++)
 		INTEGER(ans)[i + j * NR] = i + 1;
 	break;
-    case 2:
+    case 2: // col() & .col()
-	for (i = 0; i < nr; i++)
+	for (int i = 0; i < nr; i++)
-	    for (j = 0; j < nc; j++)
+	    for (int j = 0; j < nc; j++)
 		INTEGER(ans)[i + j * NR] = j + 1;
 	break;
+    }
     return ans;
+}

The R Project SVN R

(root)/trunk/src/main/array.c @ 77458 – Rev 74030 → 75324