0 was being used for Rboolaen FALSE

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

Author: ripley

src/include/Defn.h

@@ -51,6 +51,7 @@
 # define USE_RINTERNALS
 #endif
 
+// should really include R_ext/Visibility.h
 #ifdef HAVE_VISIBILITY_ATTRIBUTE
 # define attribute_visible __attribute__ ((visibility ("default")))
 # define attribute_hidden __attribute__ ((visibility ("hidden")))

src/main/coerce.c

@@ -977,7 +977,7 @@ static SEXP coercePairList(SEXP v, SEXPTYPE type)
 	    if (isString(CAR(vp)) && length(CAR(vp)) == 1)
 		SET_STRING_ELT(rval, i, STRING_ELT(CAR(vp), 0));
 	    else
-		SET_STRING_ELT(rval, i, STRING_ELT(deparse1line(CAR(vp), 0), 0));
+		SET_STRING_ELT(rval, i, STRING_ELT(deparse1line(CAR(vp), false), 0));
 	}
     }
     else if (type == VECSXP) {
@@ -1084,7 +1084,7 @@ static SEXP coerceVectorList(SEXP v, SEXPTYPE type)
 	    else
 		SET_STRING_ELT(rval, i,
 			       STRING_ELT(deparse1line_ex(VECTOR_ELT(v, i),
-							  0, NICE_NAMES),
+							  false, NICE_NAMES),
 					  0));
 	}
     }
@@ -1248,7 +1248,7 @@ SEXP coerceVector(SEXP v, SEXPTYPE type)
 	    if (isString(CAR(vp)) && length(CAR(vp)) == 1)
 		SET_STRING_ELT(ans, i, STRING_ELT(CAR(vp), 0));
 	    else
-		SET_STRING_ELT(ans, i, STRING_ELT(deparse1line(CAR(vp), 0), 0));
+		SET_STRING_ELT(ans, i, STRING_ELT(deparse1line(CAR(vp), false), 0));
 	}
 	UNPROTECT(1); /* ans */
 	break;
@@ -1323,7 +1323,7 @@ attribute_hidden SEXP CreateTag(SEXP x)
 	&& length(STRING_ELT(x, 0)) >= 1) {
 	x = installTrChar(STRING_ELT(x, 0));
     } else
-	x = installTrChar(STRING_ELT(deparse1(x, 1, SIMPLEDEPARSE), 0));
+	x = installTrChar(STRING_ELT(deparse1(x, true, SIMPLEDEPARSE), 0));
     return x;
 }
 

src/main/errors.c

@@ -493,7 +493,7 @@ static void vwarningcall_dflt(SEXP call, const char *format, va_list ap)
     else if(w == 1) {	/* print as they happen */
 	char *tr;
 	if( call != R_NilValue ) {
-	    dcall = CHAR(STRING_ELT(deparse1s(call), 0));
+	    dcall = CHAR(STRING_ELT(deparse1s(call), false));
 	} else dcall = "";
 	psize = min(BUFSIZE, R_WarnLength+1);
 	pval = Rvsnprintf_mbcs(buf, psize, format, ap);

src/main/print.c

@@ -176,7 +176,7 @@ static void PrintLanguage(SEXP s, R_PrintData *data)
 	t = eval(t, R_BaseEnv);
 	UNPROTECT(1);
     } else {
-	t = deparse1w(s, 0, data->useSource | DEFAULTDEPARSE);
+	t = deparse1w(s, false, data->useSource | DEFAULTDEPARSE);
 	R_print = *data; /* Deparsing calls PrintDefaults() */
     }
     PROTECT(t);
@@ -773,7 +773,7 @@ static void PrintExpression(SEXP s, R_PrintData *data)
     SEXP u;
     int i, n;
 
-    u = PROTECT(deparse1w(s, 0, data->useSource | DEFAULTDEPARSE));
+    u = PROTECT(deparse1w(s, false, data->useSource | DEFAULTDEPARSE));
     R_print = *data; /* Deparsing calls PrintDefaults() */
 
     n = LENGTH(u);
@@ -804,7 +804,7 @@ static void PrintSpecial(SEXP s, R_PrintData *data)
     if(s2 != R_UnboundValue) {
 	SEXP t;
 	PROTECT(s2);
-	t = deparse1m(s2, 0, DEFAULTDEPARSE); // or deparse1() ?
+	t = deparse1m(s2, false, DEFAULTDEPARSE); // or deparse1() ?
 	R_print = *data; /* Deparsing calls PrintDefaults() */
 
 	Rprintf("%s ", CHAR(STRING_ELT(t, 0))); /* translated */
@@ -871,7 +871,7 @@ attribute_hidden void PrintValueRec(SEXP s, R_PrintData *data)
 	break;
     case SYMSXP:
 	/* Use deparse here to handle backtick quotification of "weird names". */
-	t = deparse1(s, 0, SIMPLEDEPARSE); // TODO ? rather deparse1m()
+	t = deparse1(s, false, SIMPLEDEPARSE); // TODO ? rather deparse1m()
 	R_print = *data; /* Deparsing calls PrintDefaults() */
 	Rprintf("%s\n", CHAR(STRING_ELT(t, 0))); /* translated */
 	break;

src/main/relop.c

@@ -272,7 +272,7 @@ attribute_hidden SEXP do_relop_dflt(SEXP call, SEXP op, SEXP x, SEXP y)
 	SEXP tmp = allocVector(STRSXP, 1);
 	PROTECT(tmp);
 	SET_STRING_ELT(tmp, 0, (iS) ? PRINTNAME(x) :
-		       STRING_ELT(deparse1line_ex(x, 0,
+		       STRING_ELT(deparse1line_ex(x, false,
 						  DEFAULTDEPARSE | DIGITS17),
 				  0));
 	REPROTECT(x = tmp, xpi);
@@ -283,7 +283,7 @@ attribute_hidden SEXP do_relop_dflt(SEXP call, SEXP op, SEXP x, SEXP y)
 	SEXP tmp = allocVector(STRSXP, 1);
 	PROTECT(tmp);
 	SET_STRING_ELT(tmp, 0, (iS) ? PRINTNAME(y) :
-		       STRING_ELT(deparse1line_ex(y, 0,
+		       STRING_ELT(deparse1line_ex(y, false,
 						  DEFAULTDEPARSE | DIGITS17),
 				  0));
 	REPROTECT(y = tmp, ypi);