tweaks for Rboolean in packages

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

Author: ripley

src/library/grDevices/src/devQuartz.c

@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2007-2022  The R Foundation
+ *  Copyright (C) 2007-2025  The R Foundation
  *
  *  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
@@ -2646,7 +2646,7 @@ static Rboolean RQuartz_Locator(double *x, double *y, DEVDESC)
     ctx = NULL;
     if (!xd->locatePoint)
         return FALSE;
-    res = xd->locatePoint(xd, xd->userInfo, x, y);
+    res = (Rboolean) xd->locatePoint(xd, xd->userInfo, x, y);
     *x/=xd->scalex;
     *y/=xd->scaley;
     return res;
@@ -3183,7 +3183,7 @@ SEXP Quartz(SEXP args)
     height    = ARG(asReal,args);
     ps        = ARG(asReal,args);
     family    = CHAR(STRING_ELT(CAR(args), 0)); args = CDR(args);
-    antialias = ARG(asLogical,args);
+    antialias = ARG(asRboolean,args);
     title     = CHAR(STRING_ELT(CAR(args), 0)); args = CDR(args);
     bgs       = CAR(args); args = CDR(args);
     bg        = RGBpar(bgs, 0);

src/library/grid/src/grid.c

@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 2001-3 Paul Murrell
- *                2003-2024 The R Core Team
+ *                2003-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
@@ -505,7 +505,7 @@ static Rboolean noChildren(SEXP children)
 			  children));
     PROTECT(result = eval(fcall, R_gridEvalEnv)); 
     UNPROTECT(2);
-    return LOGICAL(result)[0];
+    return asRboolean(result);
 }
 
 static Rboolean childExists(SEXP name, SEXP children) 
@@ -515,7 +515,7 @@ static Rboolean childExists(SEXP name, SEXP children)
 			  name, children));
     PROTECT(result = eval(fcall, R_gridEvalEnv)); 
     UNPROTECT(2);
-    return LOGICAL(result)[0];
+    return asRboolean(result);
 }
 
 static SEXP childList(SEXP children) 
@@ -714,7 +714,7 @@ static Rboolean pathMatch(SEXP path, SEXP pathsofar, SEXP strict)
 			  path, pathsofar, strict));
     PROTECT(result = eval(fcall, R_gridEvalEnv)); 
     UNPROTECT(2);
-    return LOGICAL(result)[0];    
+    return asRboolean(result);    
 }
 
 static SEXP growPath(SEXP pathsofar, SEXP name) 
@@ -1260,8 +1260,8 @@ SEXP L_newpage(void)
     /*
      * Has the device been drawn on BY GRID yet?
      */
-    Rboolean deviceGridDirty = LOGICAL(gridStateElement(dd, 
-							GSS_GRIDDEVICE))[0];
+    Rboolean deviceGridDirty = asRboolean(gridStateElement(dd, 
+							   GSS_GRIDDEVICE));
     /*
      * Initialise grid on device
      * If no drawing on device yet, does a new page
@@ -2468,7 +2468,8 @@ SEXP gridXspline(SEXP x, SEXP y, SEXP s, SEXP o, SEXP a, SEXP rep, SEXP index,
 	    }
 	}
 	PROTECT(points = GEXspline(nx, xx, yy, ss,
-				   LOGICAL(o)[0], LOGICAL(rep)[0],
+				   (Rboolean)LOGICAL(o)[0],
+				   (Rboolean)LOGICAL(rep)[0],
 				   draw, &gc, dd));
         {
             /*
@@ -3438,7 +3439,7 @@ SEXP L_path(SEXP x, SEXP y, SEXP index, SEXP rule)
             }
     	}
     	updateGContext(currentgp, h, &gc, dd, gpIsScalar, &gcCache);
-    	GEPath(xx, yy, npoly, nper, INTEGER(rule)[0], &gc, dd);
+    	GEPath(xx, yy, npoly, nper, asRboolean(rule), &gc, dd);
     	vmaxset(vmax);
     }
     GEMode(0, dd);
@@ -3535,7 +3536,7 @@ SEXP L_raster(SEXP raster, SEXP x, SEXP y, SEXP w, SEXP h,
                 R_FINITE(ww) && R_FINITE(hh))
                 GERaster(image, INTEGER(dim)[1], INTEGER(dim)[0],
                          xx, yy, ww, hh, rotationAngle, 
-                         LOGICAL(interpolate)[i % LENGTH(interpolate)], 
+                         (Rboolean) LOGICAL(interpolate)[i % LENGTH(interpolate)], 
                          &gc, dd);
         } else {
             /* We have to do a little bit of work to figure out where the 
@@ -3567,7 +3568,7 @@ SEXP L_raster(SEXP raster, SEXP x, SEXP y, SEXP w, SEXP h,
                  */
                 GERaster(image, INTEGER(dim)[1], INTEGER(dim)[0],
                          xbl, ybl, ww, hh, rotationAngle, 
-                         LOGICAL(interpolate)[i % LENGTH(interpolate)], 
+                         (Rboolean) LOGICAL(interpolate)[i % LENGTH(interpolate)], 
                          &gc, dd);
             }
             UNPROTECT(2);

src/library/stats/src/filter.c

@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
 
- *  Copyright (C) 1999-2022   The R Core Team
+ *  Copyright (C) 1999-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
@@ -143,8 +143,8 @@ acf0(double *x, int n, int ns, int nl, Rboolean correlation, double *acf)
 
 SEXP acf(SEXP x, SEXP lmax, SEXP sCor)
 {
-    int nx = nrows(x), ns = ncols(x), lagmax = asInteger(lmax),
-	cor = asLogical(sCor);
+    int nx = nrows(x), ns = ncols(x), lagmax = asInteger(lmax);
+    Rboolean cor = asRboolean(sCor);
     x = PROTECT(coerceVector(x, REALSXP));
     SEXP ans = PROTECT(allocVector(REALSXP, (lagmax + 1)*ns*ns));
     acf0(REAL(x), nx, ns, lagmax, cor, REAL(ans));

src/library/tools/src/gramRd.y

@@ -3,7 +3,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 1995, 1996, 1997  Robert Gentleman and Ross Ihaka
- *  Copyright (C) 1997--2024  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
@@ -1983,13 +1983,13 @@ SEXP parseRd(SEXP call, SEXP op, SEXP args, SEXP env)
     	error(_("invalid '%s' value"), "verbose");
     parseState.xxDebugTokens = asInteger(CAR(args));		args = CDR(args);
     parseState.xxBasename = CHAR(STRING_ELT(CAR(args), 0));	args = CDR(args);
-    fragment = asLogical(CAR(args));				args = CDR(args);
+    fragment = asRboolean(CAR(args));				args = CDR(args);
     wcall = asLogical(CAR(args));				args = CDR(args);
     if (wcall == NA_LOGICAL)
     	error(_("invalid '%s' value"), "warningCalls");
-    wCalls = wcall;
+    wCalls = (Rboolean) wcall;
     macros = CAR(args);						args = CDR(args);
-    warnDups = asLogical(CAR(args));
+    warnDups = asRboolean(CAR(args));
 
     if (ifile >= 3) {/* file != "" */
 	if(!wasopen) {