Merge branch 'master' into issue2855

Author: venom1204

src/frank.c

@@ -3,22 +3,26 @@
 // #include <signal.h> // the debugging machinery + breakpoint aidee
 // raise(SIGINT);
 
-SEXP dt_na(SEXP x, SEXP cols) {
-  int n=0, elem;
-
+SEXP dt_na(SEXP x, SEXP cols)
+{
   if (!isNewList(x)) internal_error(__func__, "Argument '%s' to %s is type '%s' not '%s'", "x", "Cdt_na", type2char(TYPEOF(x)), "list"); // # nocov
   if (!isInteger(cols)) internal_error(__func__, "Argument '%s' to %s is type '%s' not '%s'", "cols", "Cdt_na", type2char(TYPEOF(cols)), "integer"); // # nocov
-  for (int i=0; i<LENGTH(cols); ++i) {
-    elem = INTEGER(cols)[i];
-    if (elem<1 || elem>LENGTH(x))
-      error(_("Item %d of 'cols' is %d which is outside 1-based range [1,ncol(x)=%d]"), i+1, elem, LENGTH(x));
-    if (!n) n = length(VECTOR_ELT(x, elem-1));
+
+  int n = 0;
+  const int numCols = LENGTH(cols);
+  const int* col_ints = INTEGER_RO(cols);
+  for (int i = 0; i < numCols; i++) {
+    const int elem = col_ints[i];
+    if (elem < 1 || elem > LENGTH(x))
+      error(_("Item %d of 'cols' is %d which is outside 1-based range [1,ncol(x)=%d]"), i + 1, elem, LENGTH(x));
+    if (!n) n = length(VECTOR_ELT(x, elem - 1));
   }
   SEXP ans = PROTECT(allocVector(LGLSXP, n));
   int *ians = LOGICAL(ans);
-  for (int i=0; i<n; ++i) ians[i]=0;
-  for (int i=0; i<LENGTH(cols); ++i) {
-    SEXP v = VECTOR_ELT(x, INTEGER(cols)[i]-1);
+  memset(ians, 0, n * sizeof(int));
+
+  for (int i = 0; i < numCols; i++) {
+    SEXP v = VECTOR_ELT(x, col_ints[i]-1);
     if (!length(v) || isList(v)) continue; // like stats:::na.omit.data.frame, skip pairlist columns
     if (n != length(v))
       error(_("Column %d of input list x is length %d, inconsistent with first column of that item which is length %d."), i+1,length(v),n);

src/idatetime.c

@@ -1,9 +1,9 @@
 #include "data.table.h"
 
-#define YEARS400 146097
-#define YEARS100 36524
-#define YEARS4 1461
-#define YEARS1 365
+static const int YEARS400 = 146097;
+static const int YEARS100 = 36524;
+static const int YEARS4 = 1461;
+static const int YEARS1 = 365;
 
 typedef enum { YDAY, WDAY, MDAY, WEEK, MONTH, QUARTER, YEAR, YEARMON, YEARQTR} datetype;
 
@@ -124,37 +124,40 @@ void convertSingleDate(int x, datetype type, void *out)
 SEXP convertDate(SEXP x, SEXP type)
 {
     if (!isInteger(x)) error(_("x must be an integer vector"));
-    const int *ix = INTEGER(x);
+    const int *ix = INTEGER_RO(x);
     const int n = length(x);
     if (!isString(type) || length(type) != 1)
         internal_error(__func__, "invalid type for, should have been caught before"); // # nocov
-    datetype ctype=0;
+    datetype ctype = 0;
     bool ansint = true;
-    if (!strcmp(CHAR(STRING_ELT(type, 0)), "yday")) ctype = YDAY;
-    else if (!strcmp(CHAR(STRING_ELT(type, 0)), "wday")) ctype = WDAY;
-    else if (!strcmp(CHAR(STRING_ELT(type, 0)), "mday")) ctype = MDAY;
-    else if (!strcmp(CHAR(STRING_ELT(type, 0)), "week")) ctype = WEEK;
-    else if (!strcmp(CHAR(STRING_ELT(type, 0)), "month")) ctype = MONTH;
-    else if (!strcmp(CHAR(STRING_ELT(type, 0)), "quarter")) ctype = QUARTER;
-    else if (!strcmp(CHAR(STRING_ELT(type, 0)), "year")) ctype = YEAR;
-    else if (!strcmp(CHAR(STRING_ELT(type, 0)), "yearmon")) { ctype = YEARMON; ansint = false; }
-    else if (!strcmp(CHAR(STRING_ELT(type, 0)), "yearqtr")) { ctype = YEARQTR; ansint = false; }
-    else internal_error(__func__, "invalid type for, should have been caught before"); // # nocov
-
-    SEXP ans;
+
+    const char* ctype_str = CHAR(STRING_ELT(type, 0));
+    if (!strcmp(ctype_str, "yday")) ctype = YDAY;
+    else if (!strcmp(ctype_str, "wday")) ctype = WDAY;
+    else if (!strcmp(ctype_str, "mday")) ctype = MDAY;
+    else if (!strcmp(ctype_str, "week")) ctype = WEEK;
+    else if (!strcmp(ctype_str, "month")) ctype = MONTH;
+    else if (!strcmp(ctype_str, "quarter")) ctype = QUARTER;
+    else if (!strcmp(ctype_str, "year")) ctype = YEAR;
+    else if (!strcmp(ctype_str, "yearmon")) { ctype = YEARMON; ansint = false; }
+    else if (!strcmp(ctype_str, "yearqtr")) { ctype = YEARQTR; ansint = false; }
+    else internal_error(__func__, "invalid type, should have been caught before"); // # nocov
+    
     if (ansint) {
-        ans = PROTECT(allocVector(INTSXP, n));
+        SEXP ans = PROTECT(allocVector(INTSXP, n));
         int *ansp = INTEGER(ans);
-        for (int i=0; i < n; ++i) {
+        for (int i = 0; i < n; i++) {
             convertSingleDate(ix[i], ctype, &ansp[i]);
         }
+        UNPROTECT(1);
+        return ans;
     } else {
-        ans = PROTECT(allocVector(REALSXP, n));
+        SEXP ans = PROTECT(allocVector(REALSXP, n));
         double *ansp = REAL(ans);
-        for (int i=0; i < n; ++i) {
+        for (int i = 0; i < n; i++) {
             convertSingleDate(ix[i], ctype, &ansp[i]);
         }
+        UNPROTECT(1);
+        return ans;
     }
-    UNPROTECT(1);
-    return ans;
 }