getOption("quiet") accessing C R_Quiet

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

Author: maechler

doc/NEWS.Rd

@@ -54,6 +54,11 @@
       \item \code{extSoftVersion()[["zstd"]]} now reports the version of
       the \command{zstd} compression library if available, thanks to
       \I{Trevor Davis}' patch proposal in \PR{18914}.
+
+      \item New logical \code{option()} \code{quiet}, defaulting to
+      false, set to \code{TRUE} by \R's command-line option
+      \option{--quiet} (and similar), now can be switched during an \R
+      session.  Prompted by \I{Dirk Eddelbuettel}'s proposal in \PR{18913}.
     }
   }
 
@@ -917,7 +922,7 @@
       signal an error instead of invalidating ops relying on a finite
       integer value.  Values outside the range -9 .. 9999 are now warned
       about and set to a boundary or to the default \code{0}, e.g., in
-      case of an \code{NA}.
+      case of an \code{NA}.  This also fixes \PR{16322}.
 
       \item \code{cbind()} could segfault with \code{NULL} inputs.
       (Seen when \R was built with \command{gcc-14}, \abbr{LTO} and C99

src/library/base/man/options.Rd

@@ -394,7 +394,7 @@ getOption(x, default = NULL)
     \item{\code{show.error.locations}:}{Should source locations of
       errors be printed?  If set to \code{TRUE} or \code{"top"}, the
       source location that is highest on the stack (the most recent
-      code with source information) will be printed.  
+      code with source information) will be printed.
       }
 
     \item{\code{show.error.messages}:}{a logical.  Should error messages
@@ -444,6 +444,11 @@ getOption(x, default = NULL)
       on progress?  Set to \code{TRUE} by the command-line option
       \option{--verbose}.}
 
+    \item{\code{quiet}:}{logical.  Should \R be (more) \dQuote{quiet},
+      notably on startup report?  Set to \code{TRUE} by the command-line
+      option \option{--quiet}.  \code{quiet} and \code{verbose} cannot both
+      be true.}
+
     \item{\code{warn}:}{integer value to set the handling of warning
       messages by the default warning handler.  If
       \code{warn} is negative all warnings are ignored.  If \code{warn}
@@ -520,6 +525,7 @@ getOption(x, default = NULL)
     \code{scipen} \tab \code{0} \cr
     \code{show.error.messages} \tab \code{TRUE}\cr
     \code{timeout} \tab \code{60}\cr
+    \code{quiet}   \tab \code{FALSE}\cr
     \code{verbose} \tab \code{FALSE}\cr
     \code{warn} \tab \code{0}\cr
     \code{warning.length} \tab \code{1000}\cr

src/main/options.c

@@ -52,6 +52,7 @@
  *	"width"
  *	"digits"
  *	"echo"
+ *	"quiet"
  *	"verbose"
  *	"keep.source"
  *	"keep.source.pkgs"
@@ -308,9 +309,9 @@ attribute_hidden void InitOptions(void)
 
     /* options set here should be included into mandatory[] in do_options */
 #ifdef HAVE_RL_COMPLETION_MATCHES
-    PROTECT(v = val = allocList(30));
+    PROTECT(v = val = allocList(31));
 #else
-    PROTECT(v = val = allocList(29));
+    PROTECT(v = val = allocList(30));
 #endif
 
     SET_TAG(v, install("prompt"));
@@ -341,6 +342,10 @@ attribute_hidden void InitOptions(void)
     SETCAR(v, ScalarLogical(!R_NoEcho));
     v = CDR(v);
 
+    SET_TAG(v, install("quiet"));
+    SETCAR(v, ScalarLogical(R_Quiet));
+    v = CDR(v);
+
     SET_TAG(v, install("verbose"));
     SETCAR(v, ScalarLogical(R_Verbose));
     v = CDR(v);
@@ -587,7 +592,7 @@ attribute_hidden SEXP do_options(SEXP call, SEXP op, SEXP args, SEXP rho)
 		   at startup, because otherwise one could not reliably restore
 		   previously saved options (see also PR#18372).*/
 		const char *mandatory[] = {"prompt", "continue", "expressions",
-		  "width", "deparse.cutoff", "digits", "echo", "verbose",
+		  "width", "deparse.cutoff", "digits", "echo", "quiet", "verbose",
 		  "check.bounds", "keep.source", "keep.source.pkgs",
 		  "keep.parse.data", "keep.parse.data.pkgs", "warning.length",
 		  "nwarnings", "OutDec", "CBoundsCheck",
@@ -891,10 +896,21 @@ attribute_hidden SEXP do_options(SEXP call, SEXP op, SEXP args, SEXP rho)
 		SET_VECTOR_ELT(value, i,
 			       SetOption(tag, ScalarLogical(strings_as_fact)));
 	    }
+	    else if (streql(CHAR(namei), "quiet")) {
+		if (TYPEOF(argi) != LGLSXP || LENGTH(argi) != 1)
+		    error(_("invalid value for '%s'"), CHAR(namei));
+		Rboolean k = asRbool(argi, call);
+		if(k && R_Verbose)
+		    error(_("cannot set both options 'quiet' and 'verbose' to TRUE"));
+		R_Quiet = k;
+		SET_VECTOR_ELT(value, i, SetOption(tag, ScalarLogical(k)));
+	    }
 	    else if (streql(CHAR(namei), "verbose")) {
 		if (TYPEOF(argi) != LGLSXP || LENGTH(argi) != 1)
 		    error(_("invalid value for '%s'"), CHAR(namei));
 		Rboolean k = asRbool(argi, call);
+		if(k && R_Quiet)
+		    error(_("cannot set both options 'quiet' and 'verbose' to TRUE"));
 		R_Verbose = k;
 		SET_VECTOR_ELT(value, i, SetOption(tag, ScalarLogical(k)));
 	    }