r87945 also required reverting r87940

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

Author: ripley

src/main/envir.c

@@ -875,7 +875,7 @@ attribute_hidden void unbindVar(SEXP symbol, SEXP rho)
   Callers set *canCache = TRUE or NULL
 */
 
-static SEXP findVarLocInFrame(SEXP rho, SEXP symbol, bool *canCache)
+static SEXP findVarLocInFrame(SEXP rho, SEXP symbol, Rboolean *canCache)
 {
     int hashcode;
     SEXP frame, c;
@@ -1183,7 +1183,7 @@ void readS3VarsFromFrame(SEXP rho,
 static SEXP findGlobalVarLoc(SEXP symbol)
 {
     SEXP vl, rho;
-    bool canCache = TRUE;
+    Rboolean canCache = TRUE;
     vl = R_GetGlobalCacheLoc(symbol);
     if (vl != R_UnboundValue)
 	return vl;

src/nmath/dpois.c

@@ -59,7 +59,7 @@ double dpois_raw(double x, double lambda, int give_log)
     double yh, yl;
     ebd0 (x, lambda, &yh, &yl);
     yl += stirlerr(x);
-    Rboolean Lrg_x = (x >= x_LRG); //really large x  <==>  2*pi*x  overflows
+    bool Lrg_x = (x >= x_LRG); //really large x  <==>  2*pi*x  overflows
     double r = Lrg_x
 	? M_SQRT_2PI * sqrt(x) // sqrt(.): avoid overflow for very large x
 	: M_2PI * x;

src/nmath/dt.c

@@ -51,7 +51,7 @@ double dt(double x, double n, int give_log)
 	x2n = x*x/n, // in  [0, Inf]
 	ax = 0., // <- -Wpedantic
 	l_x2n; // := log(sqrt(1 + x2n)) = log(1 + x2n)/2
-    Rboolean lrg_x2n =  (x2n > 1./DBL_EPSILON);
+    bool lrg_x2n =  (x2n > 1./DBL_EPSILON);
     if (lrg_x2n) { // large x^2/n :
 	ax = fabs(x);
 	l_x2n = log(ax) - log(n)/2.; // = log(x2n)/2 = 1/2 * log(x^2 / n)

src/nmath/qDiscrete_search.h

@@ -60,7 +60,7 @@
 
 static double DO_SEARCH_FUN(_dist_PARS_DECL_)
 {
-    Rboolean left = (lower_tail ? (*z >= p) : (*z < p));
+    bool left = (lower_tail ? (*z >= p) : (*z < p));
     R_DBG_printf(" do_search(y=%g, z=%15.10g %s p = %15.10g) --> search to %s",
 		 y, *z, (lower_tail ? ">=" : "<"), p, (left ? "left" : "right"));
     if(incr > 1)

src/nmath/qt.c

@@ -101,7 +101,7 @@ double qt(double p, double ndf, int lower_tail, int log_p)
 
     P = R_D_qIv(p); /* if exp(p) underflows, we fix below */
 
-    Rboolean neg = (!lower_tail || P < 0.5) && (lower_tail || P > 0.5),
+    bool neg = (!lower_tail || P < 0.5) && (lower_tail || P > 0.5),
 	is_neg_lower = (lower_tail == neg); /* both TRUE or FALSE == !xor */
     if(neg)
 	P = 2 * (log_p ? (lower_tail ? P : -expm1(p)) : R_D_Lval(p));
@@ -143,7 +143,7 @@ double qt(double p, double ndf, int lower_tail, int log_p)
 	    b = 48 / (a * a),
 	    c = ((20700 * a / b - 98) * a - 16) * a + 96.36,
 	    d = ((94.5 / (b + c) - 3) / b + 1) * sqrt(a * M_PI_2) * ndf;
-	Rboolean
+	bool
 	    P_ok1 = P > DBL_MIN || !log_p,
 	    P_ok  = P_ok1; // when true (after check below), use "normal scale": log_p=FALSE
 	if(P_ok1) {

src/nmath/rhyper.c

@@ -86,7 +86,7 @@ double rhyper(double nn1in, double nn2in, double kkin)
 
     int nn1, nn2, kk;
     int ix; // return value (coerced to double at the very end)
-    Rboolean setup1, setup2;
+    bool setup1, setup2;
 
     /* These should become 'thread_local globals' : */
     static int ks = -1, n1s = -1, n2s = -1;
@@ -120,20 +120,20 @@ double rhyper(double nn1in, double nn2in, double kkin)
 	}
 	// Slow, but safe: return  F^{-1}(U)  where F(.) = phyper(.) and  U ~ U[0,1]
 	return qhyper(unif_rand(), nn1in, nn2in, kkin,
-		      /*lower_tail =*/ FALSE, /*log_p = */ FALSE);
-	// lower_tail=FALSE: a thinko, is still "correct" as equiv. to  U <--> 1-U
+		      /*lower_tail =*/ false, /*log_p = */ false);
+	// lower_tail=false: a thinko, is still "correct" as equiv. to  U <--> 1-U
     }
     nn1 = (int)nn1in;
     nn2 = (int)nn2in;
     kk  = (int)kkin;
 
     /* if new parameter values, initialize */
     if (nn1 != n1s || nn2 != n2s) { // n1 | n2 is changed: setup all
-	setup1 = TRUE;	setup2 = TRUE;
+	setup1 = true;	setup2 = true;
     } else if (kk != ks) { // n1 & n2 are unchanged: setup 'k' only
-	setup1 = FALSE;	setup2 = TRUE;
+	setup1 = false;	setup2 = true;
     } else { // all three unchanged ==> no setup
-	setup1 = FALSE;	setup2 = FALSE;
+	setup1 = false;	setup2 = false;
     }
     if (setup1) { // n1 & n2
 	n1s = nn1; n2s = nn2; // save
@@ -269,7 +269,7 @@ double rhyper(double nn1in, double nn2in, double kkin)
 	}
 
 	/* acceptance/rejection test */
-	Rboolean reject = TRUE;
+	bool reject = true;
 
 	if (m < 100 || ix <= 50) {
 	    /* explicit evaluation */
@@ -288,7 +288,7 @@ double rhyper(double nn1in, double nn2in, double kkin)
 		    f = f * i * (n2 - k + i) / (n1 - i + 1) / (k - i + 1);
 	    }
 	    if (v <= f) {
-		reject = FALSE;
+		reject = false;
 	    }
 	} else {
 
@@ -331,7 +331,7 @@ double rhyper(double nn1in, double nn2in, double kkin)
 	    /* test against upper bound */
 	    alv = log(v);
 	    if (alv > ub) {
-		reject = TRUE;
+		reject = true;
 	    } else {
 				/* test against lower bound */
 		dr = xm * (r * r * r * r);
@@ -348,16 +348,16 @@ double rhyper(double nn1in, double nn2in, double kkin)
 		    de /= (1.0 + e);
 		if (alv < ub - 0.25 * (dr + ds + dt + de)
 		    + (y + m) * (gl - gu) - deltal) {
-		    reject = FALSE;
+		    reject = false;
 		}
 		else {
 		    /* * Stirling's formula to machine accuracy
 		     */
 		    if (alv <= (a - afc(ix) - afc(n1 - ix)
 				- afc(k - ix) - afc(n2 - k + ix))) {
-			reject = FALSE;
+			reject = false;
 		    } else {
-			reject = TRUE;
+			reject = true;
 		    }
 		}
 	    }