tweaks for Rboolean in packages

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

Author: ripley

src/library/grDevices/src/axis_scales.c

@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2004-2021   The R Core Team.
+ *  Copyright (C) 2004-2025   The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@
 SEXP R_CreateAtVector(SEXP axp, SEXP usr, SEXP nint, SEXP is_log)
 {
     int nint_v = asInteger(nint);
-    Rboolean logflag = asLogical(is_log);
+    Rboolean logflag = asRboolean(is_log);
 
     PROTECT(axp = coerceVector(axp, REALSXP));
     PROTECT(usr = coerceVector(usr, REALSXP));
@@ -51,7 +51,7 @@ SEXP R_GAxisPars(SEXP usr, SEXP is_log, SEXP nintLog)
     double
 	min = REAL(usr)[0],
 	max = REAL(usr)[1];
-    Rboolean logflag = asLogical(is_log);
+    Rboolean logflag = asRboolean(is_log);
     int n = asInteger(nintLog);// will be changed on output ..
 
     GAxisPars(&min, &max, &n, logflag, 0);// axis = 0 :<==> do not warn

src/library/grDevices/src/cairo/cairoBM.c

@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 1995, 1996  Robert Gentleman and Ross Ihaka
- *  Copyright (C) 1997--2023  The R Core Team
+ *  Copyright (C) 1997--2025  The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -646,7 +646,7 @@ SEXP in_Cairo(SEXP args)
 	error(_("invalid '%s' argument"), "symbolfamily");
     symbolfamily = translateChar(STRING_ELT(CAR(args), 0));
     /* scsymbol forced to have "usePUA" attribute in R code */
-    usePUA = LOGICAL(getAttrib(CAR(args), install("usePUA")))[0];
+    usePUA = asRboolean(getAttrib(CAR(args), install("usePUA")));
 
     R_GE_checkVersionOrDie(R_GE_version);
     R_CheckDeviceAvailable();

src/library/grDevices/src/devPS.c

@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 1998--2024  The R Core Team
+ *  Copyright (C) 1998--2025  The R Core Team
  *  Copyright (C) 1995, 1996  Robert Gentleman and Ross Ihaka
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -1563,7 +1563,7 @@ SEXP Type1FontInUse(SEXP name, SEXP isPDF)
     if (!isString(name) || LENGTH(name) > 1)
 	error(_("invalid font name or more than one font name"));
     return ScalarLogical(
-	findLoadedFont(CHAR(STRING_ELT(name, 0)), NULL, asLogical(isPDF))
+	findLoadedFont(CHAR(STRING_ELT(name, 0)), NULL, asRboolean(isPDF))
 	!= NULL);
 }
 
@@ -1596,7 +1596,7 @@ SEXP CIDFontInUse(SEXP name, SEXP isPDF)
     if (!isString(name) || LENGTH(name) > 1)
 	error(_("invalid font name or more than one font name"));
     return ScalarLogical(
-	findLoadedCIDFont(CHAR(STRING_ELT(name, 0)), asLogical(isPDF))
+	findLoadedCIDFont(CHAR(STRING_ELT(name, 0)), asRboolean(isPDF))
 	!= NULL);
 }
 
@@ -7764,7 +7764,7 @@ PDFDeviceDriver(pDevDesc dd, const char *file, const char *paper,
 		const char *family, const char **afmpaths,
 		const char *encoding,
 		const char *bg, const char *fg, double width, double height,
-		double ps, int onefile, int pagecentre,
+		double ps, Rboolean onefile, Rboolean pagecentre,
 		const char *title, SEXP fonts,
 		int versionMajor, int versionMinor,
 		const char *colormodel, int dingbats, int useKern,
@@ -10841,7 +10841,8 @@ SEXP PostScript(SEXP args)
     const char *file, *paper, *family=NULL, *bg, *fg, *cmd;
     const char *afms[5];
     const char *encoding, *title, call[] = "postscript", *colormodel;
-    int i, horizontal, onefile, pagecentre, printit, useKern;
+    int i, horizontal,  useKern;
+    Rboolean onefile, pagecentre, printit;
     double height, width, ps;
     SEXP fam, fonts;
     Rboolean fillOddEven;
@@ -10874,9 +10875,9 @@ SEXP PostScript(SEXP args)
     if(horizontal == NA_LOGICAL)
 	horizontal = 1;
     ps = asReal(CAR(args));	      args = CDR(args);
-    onefile = asLogical(CAR(args));   args = CDR(args);
-    pagecentre = asLogical(CAR(args));args = CDR(args);
-    printit = asLogical(CAR(args));   args = CDR(args);
+    onefile = asRboolean(CAR(args));   args = CDR(args);
+    pagecentre = asRboolean(CAR(args));args = CDR(args);
+    printit = asRboolean(CAR(args));   args = CDR(args);
     cmd = CHAR(asChar(CAR(args)));    args = CDR(args);
     title = translateChar(asChar(CAR(args)));  args = CDR(args);
     fonts = CAR(args);		      args = CDR(args);
@@ -10885,7 +10886,7 @@ SEXP PostScript(SEXP args)
     colormodel = CHAR(asChar(CAR(args)));  args = CDR(args);
     useKern = asLogical(CAR(args));   args = CDR(args);
     if (useKern == NA_LOGICAL) useKern = 1;
-    fillOddEven = asLogical(CAR(args));
+    fillOddEven = asRboolean(CAR(args));
     if (fillOddEven == NA_LOGICAL)
 	error(_("invalid value of '%s'"), "fillOddEven");
 
@@ -10935,7 +10936,8 @@ SEXP XFig(SEXP args)
     pGEDevDesc gdd;
     const void *vmax;
     const char *file, *paper, *family, *bg, *fg, *encoding;
-    int horizontal, onefile, pagecentre, defaultfont, textspecial;
+    int horizontal;
+    Rboolean onefile, pagecentre, defaultfont, textspecial;
     double height, width, ps;
 
     vmax = vmaxget();
@@ -10954,10 +10956,10 @@ SEXP XFig(SEXP args)
     if(horizontal == NA_LOGICAL)
 	horizontal = 1;
     ps = asReal(CAR(args));	      args = CDR(args);
-    onefile = asLogical(CAR(args));   args = CDR(args);
-    pagecentre = asLogical(CAR(args));args = CDR(args);
-    defaultfont = asLogical(CAR(args)); args = CDR(args);
-    textspecial = asLogical(CAR(args)); args = CDR(args);
+    onefile = asRboolean(CAR(args));   args = CDR(args);
+    pagecentre = asRboolean(CAR(args));args = CDR(args);
+    defaultfont = asRboolean(CAR(args)); args = CDR(args);
+    textspecial = asRboolean(CAR(args)); args = CDR(args);
     encoding = CHAR(asChar(CAR(args)));
 
     R_GE_checkVersionOrDie(R_GE_version);
@@ -11013,10 +11015,10 @@ SEXP PDF(SEXP args)
 	*bg, *fg, *title, call[] = "PDF", *colormodel, *author;
     const char *afms[5];
     double height, width, ps;
-    int i, onefile, pagecentre, major, minor, dingbats, useKern, useCompression, 
-	timestamp, producer;
+    int i, major, minor, dingbats, useKern, useCompression, 
+	timestamp, producer, fillOddEven;
+    Rboolean onefile, pagecentre;
     SEXP fam, fonts;
-    Rboolean fillOddEven;
 
     vmax = vmaxget();
     args = CDR(args); /* skip entry point name */
@@ -11041,8 +11043,8 @@ SEXP PDF(SEXP args)
     width = asReal(CAR(args));	      args = CDR(args);
     height = asReal(CAR(args));	      args = CDR(args);
     ps = asReal(CAR(args));           args = CDR(args);
-    onefile = asLogical(CAR(args)); args = CDR(args);
-    pagecentre = asLogical(CAR(args));args = CDR(args);
+    onefile = asRboolean(CAR(args)); args = CDR(args);
+    pagecentre = asRboolean(CAR(args));args = CDR(args);
     title = translateChar(asChar(CAR(args))); args = CDR(args);
     fonts = CAR(args); args = CDR(args);
     if (!isNull(fonts) && !isString(fonts))
@@ -11077,8 +11079,9 @@ SEXP PDF(SEXP args)
 	if(!PDFDeviceDriver(dev, file, paper, family, afms, encoding, bg, fg,
 			    width, height, ps, onefile, pagecentre,
 			    title, fonts, major, minor, colormodel,
-			    dingbats, useKern, fillOddEven,
-			    useCompression, timestamp, producer, author)) {
+			    dingbats, useKern, (Rboolean) fillOddEven,
+			    (Rboolean) useCompression, (Rboolean) timestamp,
+			    (Rboolean) producer, author)) {
 	    /* we no longer get here: error is thrown in PDFDeviceDriver */
 	    error(_("unable to start %s() device"), "pdf");
 	}

src/library/grDevices/src/devPicTeX.c

@@ -1,7 +1,7 @@
 /*
  *  A PicTeX device, (C) 1996 Valerio Aimale, for
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2001--2020  The R Core Team
+ *  Copyright (C) 2001--2025  The R Core Team
  *  Copyright (C) 1995, 1996  Robert Gentleman and Ross Ihaka
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -766,7 +766,7 @@ SEXP PicTeX(SEXP args)
     fg = CHAR(asChar(CAR(args)));   args = CDR(args);
     width = asReal(CAR(args));	     args = CDR(args);
     height = asReal(CAR(args));	     args = CDR(args);
-    debug = asLogical(CAR(args));    args = CDR(args);
+    debug = asRboolean(CAR(args));    args = CDR(args);
     if(debug == NA_LOGICAL) debug = FALSE;
 
     R_CheckDeviceAvailable();

src/library/grDevices/src/devices.c

@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 1995, 1996  Robert Gentleman and Ross Ihaka
- *  Copyright (C) 1997--2013  The R Core Team
+ *  Copyright (C) 1997--2025  The R Core Team
  *  Copyright (C) 2002--2005  The R Foundation
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -239,14 +239,13 @@ SEXP devcap(SEXP args)
 SEXP devcapture(SEXP args)
 {
     int i, col, row, nrow, ncol, size;
-    Rboolean native;
     pGEDevDesc gdd = GEcurrentDevice();
     int *rint;
     SEXP raster, image, idim;
 
     args = CDR(args);
 
-    native = asLogical(CAR(args));
+    int native = asLogical(CAR(args));
     if (native != TRUE) native = FALSE;
 
     raster = GECap(gdd);

src/library/grDevices/src/grDevices.h

@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2004-2024  The R Core Team
+ *  Copyright (C) 2004-2025  The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -60,7 +60,7 @@ PSDeviceDriver(pDevDesc, const char*, const char*, const char*,
 Rboolean
 PDFDeviceDriver(pDevDesc, const char *, const char *, const char *,
 		const char **, const char *, const char *, const char *,
-		double, double, double, int, int, const char*, SEXP,
+		double, double, double, Rboolean, Rboolean, const char*, SEXP,
 		int, int, const char *, int, int, Rboolean, Rboolean, 
 		Rboolean, Rboolean, const char *);
 

src/library/grDevices/src/stubs.c

@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2012-2014     the R Core Team
+ *  Copyright (C) 2012-2025     the R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -102,7 +102,7 @@ SEXP devAskNewPage(SEXP call, SEXP op, SEXP args, SEXP env)
     if (!isNull(CAR(args))) {
 	ask = asLogical(CAR(args));
 	if (ask == NA_LOGICAL) error(_("invalid '%s' argument"), "ask");
-	gdd->ask = ask;
+	gdd->ask = (Rboolean) ask;
 	R_Visible = FALSE;
     } else R_Visible = TRUE;
 

src/library/graphics/src/graphics.c

@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 1997--2023  The R Core Team
+ *  Copyright (C) 1997--2025  The R Core Team
  *  Copyright (C) 1995, 1996  Robert Gentleman and Ross Ihaka
  *  Copyright (C) 2002--2011  The R Foundation
  *
@@ -2069,7 +2069,7 @@ void GScale(double min, double max, int axis, pGEDevDesc dd)
      */
 
     // Computation of [xy]axp[0:2] == (min,max,n) :
-    GAxisPars(&min, &max, &n, log, axis);
+    GAxisPars(&min, &max, &n, (Rboolean) log, axis);
 
 #define G_Store_AXP(is_X)				\
     if(is_X) {						\
@@ -2277,7 +2277,7 @@ void GRestore(pGEDevDesc dd)
 /*  graphics functions.	 */
 
 static double	adjsave;	/* adj */
-static int	annsave;	/* ann */
+static Rboolean	annsave;	/* ann */
 static char	btysave;	/* bty */
 static double	cexsave;	/* cex */
 static double   lheightsave;

src/library/graphics/src/plot.c

@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 1997--2021  The R Core Team
+ *  Copyright (C) 1997--2025  The R Core Team
  *  Copyright (C) 2002--2009  The R Foundation
  *  Copyright (C) 1995, 1996  Robert Gentleman and Ross Ihaka
  *
@@ -1957,7 +1957,7 @@ SEXP C_raster(SEXP args)
            GRaster(image, INTEGER(dim)[1], INTEGER(dim)[0],
                    x0, y0, x1 - x0, y1 - y0,
                    REAL(angle)[i % LENGTH(angle)],
-                   LOGICAL(interpolate)[i % LENGTH(interpolate)], dd);
+                   (Rboolean)(LOGICAL(interpolate)[i % LENGTH(interpolate)]), dd);
     }
     GMode(0, dd);
 
@@ -2560,7 +2560,7 @@ SEXP C_mtext(SEXP args)
 	gpptr(dd)->adj = ComputeAdjValue(adjval, sideval, gpptr(dd)->las);
 	padjval = ComputePAdjValue(padjval, sideval, gpptr(dd)->las);
 	atval = ComputeAtValue(atval, gpptr(dd)->adj, sideval, gpptr(dd)->las,
-			       outerval, dd);
+			       outerval > 0, dd);
 
 	if (isExpression(text))
 	    GMMathText(VECTOR_ELT(text, i % ntext),
@@ -4030,9 +4030,9 @@ SEXP C_xspline(SEXP args)
     sy = SETCAR(args, coerceVector(CAR(args), REALSXP));  args = CDR(args);
     nx = LENGTH(sx);
     ss = SETCAR(args, coerceVector(CAR(args), REALSXP));  args = CDR(args);
-    open = asLogical(CAR(args)); args = CDR(args);
-    repEnds = asLogical(CAR(args)); args = CDR(args);
-    draw = asLogical(CAR(args)); args = CDR(args);
+    open = asRboolean(CAR(args)); args = CDR(args);
+    repEnds = asRboolean(CAR(args)); args = CDR(args);
+    draw = asRboolean(CAR(args)); args = CDR(args);
 
     PROTECT(col = FixupCol(CAR(args), R_TRANWHITE));	args = CDR(args);
     ncol = LENGTH(col);

src/library/methods/src/methods_list_dispatch.c

@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2001-2023   The R Core Team.
+ *  Copyright (C) 2001-2025   The R Core Team.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -1169,7 +1169,7 @@ SEXP R_dispatchGeneric(SEXP fname, SEXP ev, SEXP fdef)
 
 SEXP R_set_method_dispatch(SEXP onOff)
 {
-    Rboolean prev = table_dispatch_on, value = asLogical(onOff);
+    Rboolean prev = table_dispatch_on, value = asRboolean(onOff);
     if(value == NA_LOGICAL) /*  just return previous*/
 	value = prev;
     table_dispatch_on = value;