various constness and read only-ness improvements

Author: badasahog

src/inrange.c

@@ -4,8 +4,8 @@
 SEXP inrange(SEXP ansArg, SEXP xoArg, SEXP startsArg, SEXP lenArg)
 {
   int *ans = INTEGER(ansArg);
-  const int *xo = INTEGER(xoArg);
-  const int *starts = INTEGER(startsArg), *len = INTEGER(lenArg);
+  const int *xo = INTEGER_RO(xoArg);
+  const int *starts = INTEGER_RO(startsArg), *len = INTEGER_RO(lenArg);
   const int n = length(startsArg), nxo = length(xoArg);
   for (int i = 0; i < n; i++) {
     for (int j = starts[i] - 1; j < starts[i] - 1 + len[i]; j++) {

src/programming.c

@@ -7,7 +7,7 @@ static void substitute_call_arg_names(SEXP expr, SEXP env)
   SEXP arg_names = getAttrib(expr, R_NamesSymbol);
   if (!isNull(arg_names)) {
     SEXP env_names = getAttrib(env, R_NamesSymbol);
-    int *imatches = INTEGER(PROTECT(chmatch(arg_names, env_names, 0)));
+    const int *imatches = INTEGER_RO(PROTECT(chmatch(arg_names, env_names, 0)));
     const SEXP *env_sub = SEXPPTR_RO(env);
     SEXP tmp = expr;
     for (int i = 0; i < length(arg_names); i++, tmp = CDR(tmp)) { // substitute call arg names

src/reorder.c

@@ -42,7 +42,7 @@ SEXP reorder(SEXP x, SEXP order)
   int nprotect = 0;
   if (ALTREP(order)) { order=PROTECT(copyAsPlain(order)); nprotect++; }  // TODO: if it's an ALTREP sequence some optimizations are possible rather than expand
 
-  const int *restrict idx = INTEGER(order);
+  const int *restrict idx = INTEGER_RO(order);
   int i=0;
   while (i<nrow && idx[i] == i+1) ++i;
   const int start=i;

src/transpose.c

@@ -61,22 +61,22 @@ SEXP transpose(SEXP l, SEXP fill, SEXP ignoreArg, SEXP keepNamesArg, SEXP listCo
     } else PROTECT(li); // extra PROTECT just to help rchk by avoiding two counter variables
     switch (maxtype) {
     case LGLSXP: {
-      const int *ili = LOGICAL(li);
-      const int ifill = LOGICAL(fill)[0];
+      const int *ili = LOGICAL_RO(li);
+      const int ifill = LOGICAL_RO(fill)[0];
       for (int j = 0; j < maxlen; j++) {
         LOGICAL(ansp[j + rn])[k] = j < len ? ili[j] : ifill;
       }
     } break;
     case INTSXP: {
-      const int *ili = INTEGER(li);
-      const int ifill = INTEGER(fill)[0];
+      const int *ili = INTEGER_RO(li);
+      const int ifill = INTEGER_RO(fill)[0];
       for (int j = 0; j < maxlen; j++) {
         INTEGER(ansp[j + rn])[k] = j < len ? ili[j] : ifill;
       }
     } break;
     case REALSXP: {
-      const double *dli = REAL(li);
-      const double dfill = REAL(fill)[0];
+      const double *dli = REAL_RO(li);
+      const double dfill = REAL_RO(fill)[0];
       for (int j = 0; j < maxlen; j++) {
         REAL(ansp[j + rn])[k] = j < len ? dli[j] : dfill;
       }

src/types.c

@@ -73,7 +73,7 @@ SEXP testMsgR(SEXP status, SEXP x, SEXP k) {
     internal_error(__func__, "status, nx, nk must be integer"); // # nocov
   int protecti = 0;
   const bool verbose = GetVerbose();
-  int istatus = INTEGER(status)[0], nx = INTEGER(x)[0], nk = INTEGER(k)[0];
+  int istatus = INTEGER_RO(status)[0], nx = INTEGER_RO(x)[0], nk = INTEGER_RO(k)[0];
 
   // TODO below chunk into allocAnsList helper - not easy for variable length of inner vectors
   SEXP ans = PROTECT(allocVector(VECSXP, nk * nx)); protecti++;