more Rboolean tweaks

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

Author: ripley

src/main/altclasses.c

@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2016--2024   The R Core Team
+ *  Copyright (C) 2016--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
@@ -1104,9 +1104,9 @@ static SEXP mmap_Unserialize(SEXP class, SEXP state)
 {
     SEXP file = MMAP_STATE_FILE(state);
     int type = MMAP_STATE_TYPE(state);
-    Rboolean ptrOK = MMAP_STATE_PTROK(state);
-    Rboolean wrtOK = MMAP_STATE_WRTOK(state);
-    Rboolean serOK = MMAP_STATE_SEROK(state);
+    Rboolean ptrOK = (Rboolean) MMAP_STATE_PTROK(state);
+    Rboolean wrtOK = (Rboolean) MMAP_STATE_WRTOK(state);
+    Rboolean serOK = (Rboolean) MMAP_STATE_SEROK(state);
 
     SEXP val = mmap_file(file, type, ptrOK, wrtOK, serOK, TRUE);
     if (val == NULL) {
@@ -1123,9 +1123,9 @@ static SEXP mmap_Unserialize(SEXP class, SEXP state)
 static Rboolean mmap_Inspect(SEXP x, int pre, int deep, int pvec,
 			     void (*inspect_subtree)(SEXP, int, int, int))
 {
-    Rboolean ptrOK = MMAP_PTROK(x);
-    Rboolean wrtOK = MMAP_WRTOK(x);
-    Rboolean serOK = MMAP_SEROK(x);
+    Rboolean ptrOK = (Rboolean) MMAP_PTROK(x);
+    Rboolean wrtOK = (Rboolean) MMAP_WRTOK(x);
+    Rboolean serOK = (Rboolean) MMAP_SEROK(x);
     Rprintf(" mmaped %s", R_typeToChar(x));
     Rprintf(" [ptr=%d,wrt=%d,ser=%d]\n", ptrOK, wrtOK, serOK);
     return TRUE;
@@ -1338,8 +1338,8 @@ static SEXP mmap_file(SEXP file, int type, Rboolean ptrOK, Rboolean wrtOK,
 
 static Rboolean asLogicalNA(SEXP x, Rboolean dflt)
 {
-    Rboolean val = asLogical(x);
-    return val == NA_LOGICAL ? dflt : val;
+    int val = asLogical(x);
+    return val == NA_LOGICAL ? dflt : (Rboolean) val;
 }
 
 #ifdef SIMPLEMMAP
@@ -1508,8 +1508,8 @@ static SEXP wrapper_Duplicate(SEXP x, Rboolean deep)
 static Rboolean wrapper_Inspect(SEXP x, int pre, int deep, int pvec,
 				void (*inspect_subtree)(SEXP, int, int, int))
 {
-    Rboolean srt = WRAPPER_SORTED(x);
-    Rboolean no_na = WRAPPER_NO_NA(x);
+    Rboolean srt = (Rboolean) WRAPPER_SORTED(x);
+    Rboolean no_na = (Rboolean) WRAPPER_NO_NA(x);
     Rprintf(" wrapper [srt=%d,no_na=%d]\n", srt, no_na);
     inspect_subtree(WRAPPER_WRAPPED(x), pre, deep, pvec);
     return TRUE;

src/main/connections.c

@@ -1121,7 +1121,7 @@ static size_t file_write(const void *ptr, size_t size, size_t nitems,
 }
 
 static Rconnection newfile(const char *description, int enc, const char *mode,
-			   int raw)
+			   Rboolean raw)
 {
     Rconnection new;
     new = (Rconnection) malloc(sizeof(struct Rconn));
@@ -1575,7 +1575,8 @@ attribute_hidden SEXP do_fifo(SEXP call, SEXP op, SEXP args, SEXP env)
 #if (defined(HAVE_MKFIFO) && defined(HAVE_FCNTL_H)) || defined(_WIN32)
     SEXP sfile, sopen, ans, class, enc;
     const char *file, *open;
-    int ncon, block;
+    int ncon;
+    Rboolean block;
     Rconnection con = NULL;
 
     checkArity(op, args);
@@ -1589,7 +1590,7 @@ attribute_hidden SEXP do_fifo(SEXP call, SEXP op, SEXP args, SEXP env)
     sopen = CADR(args);
     if(!isString(sopen) || LENGTH(sopen) != 1)
 	error(_("invalid '%s' argument"), "open");
-    block = asLogical(CADDR(args));
+    block = asRbool(CADDR(args), call);
     if(block == NA_LOGICAL)
 	error(_("invalid '%s' argument"), "block");
     enc = CADDDR(args);
@@ -3937,7 +3938,8 @@ attribute_hidden SEXP do_sockconn(SEXP call, SEXP op, SEXP args, SEXP env)
 {
     SEXP scmd, sopen, ans, class, enc;
     const char *host, *open;
-    int ncon, port, server, blocking, timeout, serverfd, options = 0;
+    int ncon, port, server, timeout, serverfd, options = 0;
+    Rboolean blocking;
     Rconnection con = NULL;
     Rservsockconn scon = NULL;
 
@@ -3964,7 +3966,7 @@ attribute_hidden SEXP do_sockconn(SEXP call, SEXP op, SEXP args, SEXP env)
 	serverfd = scon->fd;
     }
     args = CDR(args);
-    blocking = asLogical(CAR(args));
+    blocking = asRbool(CAR(args), call);
     if(blocking == NA_LOGICAL)
 	error(_("invalid '%s' argument"), "blocking");
     args = CDR(args);
@@ -4070,11 +4072,11 @@ attribute_hidden SEXP do_unz(SEXP call, SEXP op, SEXP args, SEXP env)
 
 attribute_hidden SEXP do_open(SEXP call, SEXP op, SEXP args, SEXP env)
 {
-    int i, block;
+    int i;
     Rconnection con=NULL;
     SEXP sopen;
     const char *open;
-    Rboolean success;
+    Rboolean success, block;
 
     checkArity(op, args);
     if(!inherits(CAR(args), "connection"))
@@ -4089,7 +4091,7 @@ attribute_hidden SEXP do_open(SEXP call, SEXP op, SEXP args, SEXP env)
     sopen = CADR(args);
     if(!isString(sopen) || LENGTH(sopen) != 1)
 	error(_("invalid '%s' argument"), "open");
-    block = asLogical(CADDR(args));
+    block = asRbool(CADDR(args), call);
     if(block == NA_LOGICAL)
 	error(_("invalid '%s' argument"), "blocking");
     open = CHAR(STRING_ELT(sopen, 0)); /* ASCII */
@@ -5874,11 +5876,12 @@ attribute_hidden SEXP do_url(SEXP call, SEXP op, SEXP args, SEXP env)
 #endif
     char *class2 = "url";
     const char *url, *open;
-    int ncon, block, raw = 0, defmeth,
+    int ncon, block, defmeth,
 	meth = 0, // 0: "internal" | "wininet", 1: "libcurl"
 	winmeth = 0;  // 0: "internal", 1: "wininet" (Windows only)
     cetype_t ienc = CE_NATIVE;
     Rconnection con = NULL;
+    Rboolean raw = FALSE;
 
     checkArity(op, args);
     // --------- description
@@ -5966,7 +5969,7 @@ attribute_hidden SEXP do_url(SEXP call, SEXP op, SEXP args, SEXP env)
 
     // --------- raw, for file() only
     if(PRIMVAL(op) == 1) {
-	raw = asLogical(CAD5R(args));
+	raw = asRbool(CAD5R(args), call);
 	if(raw == NA_LOGICAL)
 	    error(_("invalid '%s' argument"), "raw");
     }
@@ -6102,7 +6105,7 @@ attribute_hidden SEXP do_url(SEXP call, SEXP op, SEXP args, SEXP env)
     }
 
     Connections[ncon] = con;
-    con->blocking = block;
+    con->blocking = (Rboolean) block;
     strncpy(con->encname, CHAR(STRING_ELT(enc, 0)), 100); /* ASCII */
     con->encname[100 - 1] = '\0';
 
@@ -6421,7 +6424,7 @@ attribute_hidden SEXP do_gzcon(SEXP call, SEXP op, SEXP args, SEXP rho)
     int icon, level, allow;
     Rconnection incon = NULL, new = NULL;
     char *m, *mode = NULL /* -Wall */,  description[1000];
-    Rboolean text;
+    int text;
 
     checkArity(op, args);
     if(!inherits(CAR(args), "connection"))
@@ -6469,7 +6472,7 @@ attribute_hidden SEXP do_gzcon(SEXP call, SEXP op, SEXP args, SEXP rho)
 	/* for Solaris 12.5 */ new = NULL;
     }
     init_con(new, description, CE_NATIVE, mode);
-    new->text = text;
+    new->text = (Rboolean) text;
     new->isGzcon = TRUE;
     new->open = &gzcon_open;
     new->close = &gzcon_close;
@@ -6486,7 +6489,7 @@ attribute_hidden SEXP do_gzcon(SEXP call, SEXP op, SEXP args, SEXP rho)
     ((Rgzconn)(new->private))->con = incon;
     ((Rgzconn)(new->private))->cp = level;
     ((Rgzconn)(new->private))->nsaved = -1;
-    ((Rgzconn)(new->private))->allow = allow;
+    ((Rgzconn)(new->private))->allow = (Rboolean) allow;
 
     /* as there might not be an R-level reference to the wrapped connection */
     R_PreserveObject(incon->ex_ptr);

src/main/context.c

@@ -177,7 +177,7 @@ static void R_restore_globals(RCNTXT *cptr)
     R_BCFrame = cptr->bcframe;
     R_EvalDepth = cptr->evaldepth;
     vmaxset(cptr->vmax);
-    R_interrupts_suspended = cptr->intsusp;
+    R_interrupts_suspended = (Rboolean) cptr->intsusp;
     R_HandlerStack = cptr->handlerstack;
     R_RestartStack = cptr->restartstack;
     while (R_PendingPromises != cptr->prstack) {
@@ -891,7 +891,7 @@ R_tryEval(SEXP e, SEXP env, int *ErrorOccurred)
 SEXP R_tryEvalSilent(SEXP e, SEXP env, int *ErrorOccurred)
 {
     SEXP val;
-    Rboolean oldshow = R_ShowErrorMessages;
+    int oldshow = R_ShowErrorMessages;
     R_ShowErrorMessages = FALSE;
     val = R_tryEval(e, env, ErrorOccurred);
     R_ShowErrorMessages = oldshow;

src/main/main.c

@@ -1909,7 +1909,7 @@ R_taskCallbackRoutine(SEXP expr, SEXP value, Rboolean succeeded,
     SEXP f = (SEXP) userData;
     SEXP e, val, cur, rho;
     int errorOccurred;
-    Rboolean again, useData = LOGICAL(VECTOR_ELT(f, 2))[0];
+    Rboolean again, useData = (Rboolean)LOGICAL(VECTOR_ELT(f, 2))[0];
 
     /* create an environment with bindings for the function and arguments */
     PROTECT(rho = NewEnvironment(R_NilValue, R_NilValue, R_GlobalEnv));
@@ -1948,7 +1948,7 @@ R_taskCallbackRoutine(SEXP expr, SEXP value, Rboolean succeeded,
 	    /* It would be nice to identify the function. */
 	    warning(_("top-level task callback did not return a logical value"));
 	}
-	again = asLogical(val);
+	again = (Rboolean) asLogical(val);
     } else {
 	/* warning("error occurred in top-level task callback\n"); */
 	again = FALSE;