Rboolean -> bool

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

Author: ripley

src/include/Defn.h

@@ -2023,11 +2023,11 @@ void CustomPrintValue(SEXP, SEXP);
 double currentTime(void);
 void DataFrameClass(SEXP);
 SEXP ddfindVar(SEXP, SEXP);
-SEXP deparse1(SEXP,Rboolean,int);
-SEXP deparse1m(SEXP call, Rboolean abbrev, int opts);
-SEXP deparse1w(SEXP,Rboolean,int);
-SEXP deparse1line (SEXP, Rboolean);
-SEXP deparse1line_ex(SEXP, Rboolean, int);
+SEXP deparse1(SEXP,bool,int);
+SEXP deparse1m(SEXP call, bool abbrev, int opts);
+SEXP deparse1w(SEXP,bool,int);
+SEXP deparse1line (SEXP, bool);
+SEXP deparse1line_ex(SEXP, bool, int);
 SEXP deparse1s(SEXP call);
 int DispatchAnyOrEval(SEXP, SEXP, const char *, SEXP, SEXP, SEXP*, int, int);
 int DispatchOrEval(SEXP, SEXP, const char *, SEXP, SEXP, SEXP*, int, int);

src/main/bind.c

@@ -1467,7 +1467,7 @@ static SEXP cbind(SEXP call, SEXP args, SEXPTYPE mode, SEXP rho,
 		    else if (deparse_level == 2) {
 			PROTECT(expr);
 			SET_STRING_ELT(nam, j++,
-				       STRING_ELT(deparse1line(expr, TRUE), 0));
+				       STRING_ELT(deparse1line(expr, true), 0));
 			UNPROTECT(1); /* expr */
 		    } else if (have_cnames)
 			SET_STRING_ELT(nam, j++, R_BlankString);
@@ -1709,7 +1709,7 @@ static SEXP rbind(SEXP call, SEXP args, SEXPTYPE mode, SEXP rho,
 		    else if (deparse_level == 2) {
 			PROTECT(expr);
 			SET_STRING_ELT(nam, j++,
-				       STRING_ELT(deparse1line(expr, TRUE), 0));
+				       STRING_ELT(deparse1line(expr, true), 0));
 			UNPROTECT(1); /* expr */
 		    } else if (have_rnames)
 			SET_STRING_ELT(nam, j++, R_BlankString);

src/main/builtin.c

@@ -998,8 +998,8 @@ static SEXP setDflt(SEXP arg, SEXP dflt)
 {
     if (dflt) {
 	SEXP dflt1, dflt2;
-	PROTECT(dflt1 = deparse1line(dflt, TRUE));
-	PROTECT(dflt2 = deparse1line(CAR(arg), TRUE));
+	PROTECT(dflt1 = deparse1line(dflt, true));
+	PROTECT(dflt2 = deparse1line(CAR(arg), true));
 	error(_("duplicate 'switch' defaults: '%s' and '%s'"),
 	      CHAR(STRING_ELT(dflt1, 0)), CHAR(STRING_ELT(dflt2, 0)));
 	UNPROTECT(2); /* won't get here, but just for good form */