Fixing checks

Author: dipterix

R/methods-subset.R

@@ -22,13 +22,12 @@ fa_subset1 <- function(x, ..., drop = TRUE, reshape = NULL, strict = TRUE, dimna
 
     listOrEnv <- list()
     if(arglen == 1){
-        tmp <- tryCatch({
-            ...elt(1)
-        }, error = function(e){
-            NULL
-        })
-        if(length(tmp)){
-            stop("Subset FileArray only allows x[], x[i:j] or x[i,j,...] (single logical index like x[c(TRUE, ...)] is not allowed)")
+        missing_args <- check_missing_dots(environment())
+        if(length(missing_args) > 0 && !missing_args[[1]]){
+            tmp <- ...elt(1)
+            if(length(tmp)){
+                stop("Subset FileArray only allows x[], x[i:j] or x[i,j,...] (single logical index like x[c(TRUE, ...)] is not allowed)")
+            }
         }
 
 

src/collapse.cpp

@@ -318,7 +318,7 @@ void collapse_complex(
 
         for(int64_t jj = 0; jj < readlen; jj++){
             v = *(bufcplx_ptr + jj);
-            if( remove_na && (v.i == NA_REAL || v.r == NA_REAL) ){
+            if( remove_na && (ISNAN(v.i) || ISNAN(v.r)) ){
                 continue;
             }
             rem = jj + buf_idx; 
@@ -336,9 +336,11 @@ void collapse_complex(
                 fct *= *(dimptr + tmp);
             }
             ret_ii = ret + rem;
-            if( v.i == NA_REAL || v.r == NA_REAL ){ // remove_na must be false
+            if( ISNAN(v.i) || ISNAN(v.r) ){ // remove_na must be false
                 *ret_ii = na_cplx;
                 continue;
+            } else if( !remove_na && (ISNAN(ret_ii->r) || ISNAN(ret_ii->i)) ){
+                continue;
             }
             // rem is index of ret
             // need to be atom

src/utils.cpp

@@ -20,7 +20,7 @@ List test_farr_findVarInFrame_(SEXP env, std::string sym_name) {
         Rcpp::stop("env must be an environment");
     }
     SEXP sym = Rf_install(sym_name.c_str());
-    SEXP result = farr_findVarInFrame(env, sym);
+    SEXP result = PROTECT(farr_findVarInFrame(env, sym));
     bool is_missing = (result == R_MissingArg);
     // farr_findVarInFrame maps R_UnboundValue → R_NilValue, so we need
     // an independent check to report is_unbound correctly.
@@ -30,6 +30,7 @@ List test_farr_findVarInFrame_(SEXP env, std::string sym_name) {
     bool is_unbound = (Rf_findVarInFrame(env, sym) == R_UnboundValue);
 #endif
     SEXP rval = (is_unbound || is_missing) ? R_NilValue : result;
+    UNPROTECT(1);
     return List::create(
         _["result"]     = rval,
         _["is_unbound"] = is_unbound,
@@ -178,7 +179,7 @@ SEXP check_missing_dots(const SEXP env){
     if( TYPEOF(env) != ENVSXP ){
         Rcpp::stop("`check_missing_dots` is asking for an environment");
     }
-    SEXP dots = farr_findVarInFrame(env, R_DotsSymbol);
+    SEXP dots = PROTECT(farr_findVarInFrame(env, R_DotsSymbol));
 
     std::vector<bool> is_missing(0);
 
@@ -195,6 +196,7 @@ SEXP check_missing_dots(const SEXP env){
         }
     }
 
+    UNPROTECT(1);
     return(Rcpp::wrap(is_missing));
 }