is.atomic(NULL) now is FALSE

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

Author: maechler

doc/NEWS.Rd

@@ -14,6 +14,11 @@
       32-bit platforms will still report \code{(32-bit)}.
 
       On Windows, ditto for window titles.
+
+      \item \code{is.atomic(NULL)} now returns \code{FALSE}, as \code{NULL}
+      is not an atomic vector.  Strict back compatibility would
+      replace \code{is.atomic(foo)} by \code{(is.null(foo) || is.atomic(foo))}
+      but should happen sparingly only.
     }
   }
 

src/main/coerce.c

@@ -2064,8 +2064,10 @@ attribute_hidden SEXP do_is(SEXP call, SEXP op, SEXP args, SEXP rho)
 
     case 200:		/* is.atomic */
 	switch(TYPEOF(CAR(args))) {
+#ifdef S_compatible_BUT_UNDESIRABLE
 	case NILSXP:
 	    /* NULL is atomic (S compatibly), but not in isVectorAtomic(.) */
+#endif
 	case CHARSXP:
 	case LGLSXP:
 	case INTSXP:

tests/demos.Rout.save

@@ -338,7 +338,7 @@ Number of functions from these:	1347
 
 > is.ALL(NULL)
 is.array           : . 
-is.atomic          : | 
+is.atomic          : . 
 is.call            : . 
 is.character       : . 
 is.complex         : . 
@@ -349,15 +349,15 @@ is.expression      : .
 is.factor          : . 
 is.finite          : NA 
 is.function        : . 
-is.infinite        :  
+is.infinite        : NA 
 is.integer         : . 
 is.language        : . 
 is.list            : . 
 is.logical         : . 
 is.matrix          : . 
 is.na              : NA 
 is.name            : . 
-is.nan             :  
+is.nan             : NA 
 is.null            : | 
 is.numeric         : . 
 is.numeric_version : . 
@@ -375,7 +375,7 @@ is.vector          : .
 
 > ##fails: is.ALL(NULL, not.using = c("is.single", "is.loaded"))
 > is.ALL(NULL,   true.only = TRUE)
-[1] "is.atomic"   "is.null"     "is.pairlist"
+[1] "is.null"     "is.pairlist"
 
 > all.equal(NULL, pairlist())
 [1] TRUE

tests/reg-tests-1e.R

@@ -857,7 +857,8 @@ stopifnot(exprs = {
 ## negative integer scalars
 tools::assertWarning(compiler::cmpfun(function(x) sqrt(x))(-1L))
 
-
+## is.atomic(NULL) is no longer true
+if(is.atomic(NULL)) stop("Should no longer happen: 'NULL' is not atomic")
 ## untested previously
 stopifnot(is.null(sort(NULL)), is.null(sort.int(NULL)))
 ## failed in first version of `R-is` branch