using deprecated options(OutDec = "<gt-1-char>") now warns in format()

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

Author: maechler

doc/NEWS.Rd

@@ -415,6 +415,10 @@
       call with \code{glyphInfo()} that describes non-existent font
       (\PR{18784}).  Thanks to \I{Tomek Gieorgijewski}.
 
+      \item \code{format()} etc, using \code{decimal.mark = s}, by default
+      getting \code{s <- getOption("OutDec")}, signals a warning to become
+      an error in the future, when \code{s} is not a string with exactly
+      one character.
     }
   }
 }

src/main/paste.c

@@ -515,9 +515,9 @@ attribute_hidden SEXP do_format(SEXP call, SEXP op, SEXP args, SEXP env)
 	my_OutDec = OutDec; // default
     else {
 	static char sdec[11];
-// not warning here by default for now
-#ifdef _WARN_decimal_mark_non_1
-	if(R_nchar(STRING_ELT(CAR(args), 0), Chars,
+#define _WARN_decimal_mark_non_1 // were *not* warning here by default since 2015-06-19
+#ifdef  _WARN_decimal_mark_non_1
+ 	if(R_nchar(STRING_ELT(CAR(args), 0), Chars,
 		   /* allowNA = */ FALSE, /* keepNA = */ FALSE,
 		   "decimal.mark") != 1) // will become an error
 	    warning(_("'decimal.mark' must be a string of one character"));

tests/reg-tests-1c.R

@@ -840,17 +840,19 @@ unlink(profile)
 ## failed when a matrix was downgraded to a vector
 
 
+assertWarnV <- function(...) tools::assertWarning(..., verbose=TRUE)
+
 ## option(OutDec = *)  -- now gives a warning when  not 1 character
 op <- options(OutDec = ".", digits = 7, # <- default
               warn = 2)# <- (unexpected) warnings become errors
 stopifnot(identical("3.141593", fpi <- format(pi)))
 options(OutDec = ",")
 stopifnot(identical("3,141593", cpi <- format(pi)))
 ## warnings, but it "works" (for now):
-tools::assertWarning(options(OutDec = ".1."), verbose=TRUE)
-stopifnot(identical("3.1.141593", format(pi)))
-tools::assertWarning(options(OutDec = ""), verbose=TRUE)
-tools::assertWarning(stopifnot(identical("3141593", format(pi))))
+assertWarnV(options(OutDec = ".1."))
+assertWarnV(stopifnot(identical("3.1.141593", format(pi)))) # newly warns (2024-12)
+assertWarnV(options(OutDec = ""))
+assertWarnV(stopifnot(identical("3141593", format(pi)))) # newly warns
 options(op)# back to sanity
 ## No warnings in R versions <= 3.2.1
 
@@ -1589,7 +1591,7 @@ doit()
 if(nzchar(Sys.getenv("tar"))) doit(tar = "internal")
 if(nzchar(Sys.which("tar"))) doit(tar = "tar")
 ## internal tar silently ignored unused 'files' in R <= 4.0.2
-tools::assertWarning(verbose=TRUE,
+assertWarnV(
     tar(tempfile(fileext=".tar"), files = tempfile(), tar = "internal")
 )