correct warning message in some hist(*, plot=FALSE) cases

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

Author: maechler

src/library/graphics/R/hist.R

@@ -97,7 +97,7 @@ hist.default <-
     nB <- as.integer(nB)
     if(is.na(nB)) stop("invalid length(breaks)")
 
-    ## Do this *before* adding fuzz or logic breaks down...
+    ## Do this *before* adding fuzz or logic breaks down ..
 
     h <- as.double(diff(breaks))
     equidist <- !use.br || diff(range(h)) < 1e-7 * mean(h)
@@ -145,18 +145,25 @@ hist.default <-
     }
     else { ## plot is FALSE
     	if (warn.unused) {
-	    ## make an effort to warn about "nonsensical" arguments:
+	    ## make an effort to warn about "nonsensical" arguments, notably those only in plot(.) above
 	    nf <- names(formals()) ## all formals but those:
 	    nf <- nf[is.na(match(nf, c("x", "breaks", "nclass", "plot",
 				       "include.lowest", "right", "fuzz")))]
 	    missE <- lapply(nf, function(n)
 			    substitute(missing(.), list(. = as.name(n))))
 	    not.miss <- ! vapply(missE, eval, NA, envir = environment())
+	    nf <- nf[not.miss]
+	    nnmiss <- sum(not.miss)
+	    if(any(iM <- nf == "...")) { # replace "..." with arg names in `...`
+		dnms <- ...names()
+		nf     <- c(nf[!iM], dnms)
+		nnmiss <- nnmiss -1L + length(dnms)
+	    }
 	    if(any(not.miss))
-		warning(sprintf(ngettext(sum(not.miss),
+		warning(sprintf(ngettext(nnmiss,
 					 "argument %s is not made use of",
 					 "arguments %s are not made use of"),
-				paste(sQuote(nf[not.miss]), collapse=", ")),
+				paste(sQuote(nf), collapse=", ")),
 			domain = NA)
 	}
         r

tests/reg-tests-1e.R

@@ -1610,6 +1610,7 @@ assertWarnV(options(scipen = -100))# warns and sets to min = -9
 stopifnot(identical(getOption("scipen"), -9L))
 assertWarnV(options(scipen = 100000))# warns and sets to max = 9999
 stopifnot(identical(getOption("scipen"), 9999L))
+options(scipen=scipenO) # revert
 ## setting to NULL  would invalidate as.character(Sys.time())
 
 
@@ -2047,9 +2048,7 @@ assertValueIs("1")
 
 
 ## No warnings for hist(.., log="x") -- PR#18921
-op <- options(warn = 2)
 hist(1:100, breaks = 2^(0:8), log = "x")
-options(op)
 ## used to signal 3 warnings
 
 
@@ -2084,6 +2083,18 @@ stopifnot(is.list(Ldt), vapply(Ldt, inherits, NA, "Date"),
 # fD  was "11100" "11101" .... "11111" in R <= 4.5.z
 
 
+## hist(*, plot=FALSE) warning about "nonsensical" arguments
+hiW <- getVaW(hist(1:22, log = "x", plot = FALSE))
+hi. <- hist(1:22, log = "x", plot = FALSE, warn.unused = FALSE) # no warning
+noA <- \(x) `attributes<-`(x, NULL)
+stopifnot(exprs = {
+    nzchar(print(wmsg <- attr(hiW,"warning")))
+    grepl(sQuote("log"), wmsg)
+    identical(noA(hiW), noA(hi.))
+})
+## warning msg confusingly had '...' instead of 'log'
+
+
 
 ## keep at end
 rbind(last =  proc.time() - .pt,