Merge branch 'master' into stdisfinite

Author: badasahog

src/fmelt.c

@@ -282,23 +282,23 @@ SEXP checkVars(SEXP DT, SEXP id, SEXP measure, Rboolean verbose) {
 }
 
 struct processData {
-  SEXP RCHK;      // a 2 item list holding vars (result of checkVars) and not_NA_indices. PROTECTed up in fmelt so that preprocess() doesn't need to PROTECT. To pass rchk, #2865
-  SEXP idcols,    // convenience pointers into RCHK[0][0], RCHK[0][1] and RCHK[1] respectively
-    variable_table, // NULL or data for variable column(s).
-    valuecols,    // list with one element per output/value column, each element is an integer vector.
-    not_NA_indices;
-  int *isfactor,
-    *leach,       // length of each element of the valuecols(measure.vars) list.
-    *isidentical; // are all inputs for this value column the same type?
-  int lids,       // number of id columns.
-    lvars,        // number of variable columns.
-    lvalues,      // number of value columns.
-    lmax,         // max length of valuecols elements / number of times to repeat ids.
-    totlen,       // of output/long DT result of melt operation.
-    nrow;         // of input/wide DT to be melted.
+  SEXP RCHK;           // a 2 item list holding vars (result of checkVars) and not_NA_indices. PROTECTed up in fmelt so that preprocess() doesn't need to PROTECT. To pass rchk, #2865
+  SEXP idcols;         // convenience pointers into RCHK[0][0], RCHK[0][1] and RCHK[1] respectively
+  SEXP variable_table; // NULL or data for variable column(s).
+  SEXP valuecols;      // list with one element per output/value column, each element is an integer vector.
+  SEXP not_NA_indices;
+  int *isfactor;
+  int *leach;          // length of each element of the valuecols(measure.vars) list.
+  int *isidentical;    // are all inputs for this value column the same type?
+  int lids;            // number of id columns.
+  int lvars;           // number of variable columns.
+  int lvalues;         // number of value columns.
+  int lmax;            // max length of valuecols elements / number of times to repeat ids.
+  int totlen;          // of output/long DT result of melt operation.
+  int nrow;            // of input/wide DT to be melted.
   SEXPTYPE *maxtype;
-  bool measure_is_list,
-    narm;  // remove missing values?
+  bool measure_is_list;
+  bool narm;           // remove missing values?
 };
 
 static void preprocess(SEXP DT, SEXP id, SEXP measure, SEXP varnames, SEXP valnames, Rboolean narm, Rboolean verbose, struct processData *data) {

src/freadR.c

@@ -265,15 +265,13 @@ bool userOverride(int8_t *type, lenOff *colNames, const char *anchor, const int
   colNamesSxp = R_NilValue;
   SET_VECTOR_ELT(RCHK, 1, colNamesSxp = allocVector(STRSXP, ncol));
   for (int i = 0; i < ncol; i++) {
-    SEXP elem;
     if (colNames == NULL || colNames[i].len <= 0) {
       char buff[12];
       snprintf(buff, sizeof(buff), "V%d", i + 1); // # notranslate
-      elem = mkChar(buff);  // no PROTECT as passed immediately to SET_STRING_ELT
+      SET_STRING_ELT(colNamesSxp, i, mkChar(buff));  // no PROTECT as passed immediately to SET_STRING_ELT
     } else {
-      elem = mkCharLenCE(anchor + colNames[i].off, colNames[i].len, ienc);  // no PROTECT as passed immediately to SET_STRING_ELT
+      SET_STRING_ELT(colNamesSxp, i, mkCharLenCE(anchor + colNames[i].off, colNames[i].len, ienc));  // no PROTECT as passed immediately to SET_STRING_ELT
     }
-    SET_STRING_ELT(colNamesSxp, i, elem);
   }
   // "use either select= or drop= but not both" was checked earlier in freadR
   applyDrop(dropSxp, type, ncol, /*dropSource=*/-1);

src/quickselect.c

@@ -2,9 +2,9 @@
 
 // from good ol' Numerical Recipes in C
 
-static inline void iswap(int *a, int *b)           {int     tmp=*a; *a=*b; *b=tmp;}
-static inline void dswap(double *a, double *b)     {double  tmp=*a; *a=*b; *b=tmp;}
-static inline void i64swap(int64_t *a, int64_t *b) {int64_t tmp=*a; *a=*b; *b=tmp;}
+static inline void iswap(int *a, int *b)           { int     tmp = *a; *a = *b; *b = tmp; }
+static inline void dswap(double *a, double *b)     { double  tmp = *a; *a = *b; *b = tmp; }
+static inline void i64swap(int64_t *a, int64_t *b) { int64_t tmp = *a; *a = *b; *b = tmp; }
 
 #undef BODY
 #define BODY(SWAP)                          \
@@ -30,7 +30,7 @@ static inline void i64swap(int64_t *a, int64_t *b) {int64_t tmp=*a; *a=*b; *b=tm
         SWAP(x + l, x + l + 1);             \
       }                                     \
       unsigned long i = l + 1, j = ir;      \
-      a=x[l + 1];                           \
+      a = x[l + 1];                         \
       for (;;) {                            \
         do i++; while (x[i] < a);           \
         do j--; while (x[j] > a);           \
@@ -44,7 +44,7 @@ static inline void i64swap(int64_t *a, int64_t *b) {int64_t tmp=*a; *a=*b; *b=tm
     }                                       \
   }                                         \
   a = x[med];                               \
-  if (n%2 == 1) {                           \
+  if (n % 2 == 1) {                         \
     return (double)a;                       \
   } else {                                  \
     b = x[med + 1];                         \