add option R_LESS_COERCION_FROM_NULL, avoid as.logical(NULL)

git-svn-id: https://svn.r-project.org/R/trunk@87410 00db46b3-68df-0310-9c12-caf00c1e9a41

Author: ripley

src/library/base/R/funprog.R

@@ -105,7 +105,9 @@ Filter <-
 function(f, x)
 {
     f <- match.fun(f)
-    ind <- as.logical(unlist(lapply(x, f)))
+    z <- unlist(lapply(x, f)) # could be NULL
+    if(is.null(z)) return(x[integer()])
+    ind <- as.logical(z)
     x[which(ind)]
 }
 
@@ -128,7 +130,7 @@ Position <-
 function(f, x, right = FALSE, nomatch = NA_integer_)
 {
     f <- match.fun(f)
-    
+
     ind <- if(right) rev(seq_along(x)) else seq_along(x)
 
     for(i in ind)

src/main/coerce.c

@@ -1379,6 +1379,8 @@ static SEXP asFunction(SEXP x)
     return f;
 }
 
+//#define R_LESS_COERCION_FROM_NULL
+// cannot yet build methods package with R_NO_LOGICAL_COERCION_FROM_NULL
 static SEXP ascommon(SEXP call, SEXP u, SEXPTYPE type)
 {
     /* -> as.vector(..) or as.XXX(.) : coerce 'u' to 'type' : */
@@ -1397,6 +1399,11 @@ static SEXP ascommon(SEXP call, SEXP u, SEXPTYPE type)
 	if(TYPEOF(u) == NILSXP && type == INTSXP)
 	    errorcall(call, _(COERCE_ERROR_STRING),
 		      R_typeToChar(u), type2char(type));
+#endif
+#ifdef R_NO_LOGICAL_COERCION_FROM_NULL
+	if(TYPEOF(u) == NILSXP && type == LGLSXP)
+	    errorcall(call, _(COERCE_ERROR_STRING),
+		      R_typeToChar(u), type2char(type));
 #endif
 	if (type != ANYSXP && TYPEOF(u) != type) v = coerceVector(u, type);
 	else v = u;