convert Callbacks.h to bool

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

Author: ripley

src/main/main.c

@@ -68,8 +68,8 @@ attribute_hidden void nl_Rdummy(void)
  */
 
 attribute_hidden
-void Rf_callToplevelHandlers(SEXP expr, SEXP value, Rboolean succeeded,
-			     Rboolean visible);
+void Rf_callToplevelHandlers(SEXP expr, SEXP value, bool succeeded,
+			     bool visible);
 
 static int ParseBrowser(SEXP, SEXP);
 
@@ -200,7 +200,7 @@ Rf_ReplIteration(SEXP rho, int savestack, int browselevel, R_ReplState *state)
 {
     int c, browsevalue;
     SEXP value, thisExpr;
-    bool wasDisplayed = FALSE;
+    bool wasDisplayed = false;
 
     /* clear warnings that might have accumulated during a jump to top level */
     if (R_CollectWarnings)
@@ -271,7 +271,7 @@ Rf_ReplIteration(SEXP rho, int savestack, int browselevel, R_ReplState *state)
 	    PrintValueEnv(value, rho);
 	if (R_CollectWarnings)
 	    PrintWarnings();
-	Rf_callToplevelHandlers(thisExpr, value, TRUE, wasDisplayed);
+	Rf_callToplevelHandlers(thisExpr, value, true, wasDisplayed);
 	R_CurrentExpr = value; /* Necessary? Doubt it. */
 	UNPROTECT(2); /* thisExpr, value */
 	if (R_BrowserLastCommand == 'S') R_BrowserLastCommand = 's';
@@ -333,7 +333,7 @@ static void check_session_exit(void)
 	   error is signaled from one of the functions called. The
 	   'exiting' variable identifies this and results in
 	   R_Suicide. */
-	static bool exiting = FALSE;
+	static bool exiting = false;
 	if (exiting)
 	    R_Suicide(_("error during cleanup\n"));
 	else {
@@ -368,7 +368,7 @@ int R_ReplDLLdo1(void)
     int c;
     ParseStatus status;
     SEXP rho = R_GlobalEnv, lastExpr;
-    bool wasDisplayed = FALSE;
+    bool wasDisplayed = false;
 
     if(!*DLLbufp) {
 	R_Busy(0);
@@ -405,7 +405,7 @@ int R_ReplDLLdo1(void)
 	    PrintValueEnv(R_CurrentExpr, rho);
 	if (R_CollectWarnings)
 	    PrintWarnings();
-	Rf_callToplevelHandlers(lastExpr, R_CurrentExpr, TRUE, wasDisplayed);
+	Rf_callToplevelHandlers(lastExpr, R_CurrentExpr, true, wasDisplayed);
 	UNPROTECT(1);
 	R_IoBufferWriteReset(&R_ConsoleIob);
 	R_Busy(0);
@@ -1615,14 +1615,14 @@ static R_ToplevelCallbackEl *Rf_CurrentToplevelHandler = NULL;
 
   /* A running handler attempted to remove itself from Rf_ToplevelTaskHandlers,
      do it after it finishes. */
-static Rboolean Rf_DoRemoveCurrentToplevelHandler = FALSE;
+static bool Rf_DoRemoveCurrentToplevelHandler = false;
 
   /* A handler has been removed from the Rf_ToplevelTaskHandlers. */
-static Rboolean Rf_RemovedToplevelHandlers = FALSE;
+static bool Rf_RemovedToplevelHandlers = false;
 
   /* Flag to ensure that the top-level handlers aren't called recursively.
      Simple state to indicate that they are currently being run. */
-static Rboolean Rf_RunningToplevelHandlers = FALSE;
+static bool Rf_RunningToplevelHandlers = false;
 
 /**
   This is the C-level entry point for registering a handler
@@ -1677,24 +1677,24 @@ Rf_addTaskCallback(R_ToplevelCallback cb, void *data,
 static void removeToplevelHandler(R_ToplevelCallbackEl *e)
 {
     if (Rf_CurrentToplevelHandler == e)
-	Rf_DoRemoveCurrentToplevelHandler = TRUE; /* postpone */
+	Rf_DoRemoveCurrentToplevelHandler = true; /* postpone */
     else {
-	Rf_RemovedToplevelHandlers = TRUE;
+	Rf_RemovedToplevelHandlers = true;
 	if(e->finalizer)
 	    e->finalizer(e->data);
 	free(e->name);
 	free(e);
     }
 }
 
-attribute_hidden Rboolean
+attribute_hidden bool
 Rf_removeTaskCallbackByName(const char *name)
 {
     R_ToplevelCallbackEl *el = Rf_ToplevelTaskHandlers, *prev = NULL;
-    Rboolean status = TRUE;
+    bool status = true;
 
     if(!Rf_ToplevelTaskHandlers) {
-	return(FALSE); /* error("there are no task callbacks registered"); */
+	return(false); /* error("there are no task callbacks registered"); */
     }
 
     while(el) {
@@ -1712,7 +1712,7 @@ Rf_removeTaskCallbackByName(const char *name)
     if(el)
 	removeToplevelHandler(el);
     else 
-	status = FALSE;
+	status = false;
 
     return(status);
 }
@@ -1721,11 +1721,11 @@ Rf_removeTaskCallbackByName(const char *name)
   Remove the top-level task handler/callback identified by
   its position in the list of callbacks.
  */
-attribute_hidden Rboolean
+attribute_hidden bool
 Rf_removeTaskCallbackByIndex(int id)
 {
     R_ToplevelCallbackEl *el = Rf_ToplevelTaskHandlers, *tmp = NULL;
-    Rboolean status = TRUE;
+    bool status = true;
 
     if(id < 0)
 	error(_("negative index passed to R_removeTaskCallbackByIndex"));
@@ -1750,7 +1750,7 @@ Rf_removeTaskCallbackByIndex(int id)
     if(tmp)
 	removeToplevelHandler(tmp);
     else
-	status = FALSE;
+	status = false;
 
     return(status);
 }
@@ -1768,17 +1768,17 @@ attribute_hidden SEXP
 R_removeTaskCallback(SEXP which)
 {
     int id;
-    Rboolean val;
+    bool val;
 
     if(TYPEOF(which) == STRSXP) {
 	if (LENGTH(which) == 0)
-	    val = FALSE;
+	    val = false;
 	else
 	    val = Rf_removeTaskCallbackByName(CHAR(STRING_ELT(which, 0)));
     } else {
 	id = asInteger(which);
 	if (id != NA_INTEGER) val = Rf_removeTaskCallbackByIndex(id - 1);
-	else val = FALSE;
+	else val = false;
     }
     return ScalarLogical(val);
 }
@@ -1819,28 +1819,28 @@ R_getTaskCallbackNames(void)
 
 /* This is not used in R and in no header */
 void
-Rf_callToplevelHandlers(SEXP expr, SEXP value, Rboolean succeeded,
-			Rboolean visible)
+Rf_callToplevelHandlers(SEXP expr, SEXP value, bool succeeded,
+			bool visible)
 {
     R_ToplevelCallbackEl *h, *prev = NULL;
-    Rboolean again;
+    bool again;
 
-    if(Rf_RunningToplevelHandlers == TRUE)
+    if(Rf_RunningToplevelHandlers == true)
 	return;
 
     h = Rf_ToplevelTaskHandlers;
-    Rf_RunningToplevelHandlers = TRUE;
+    Rf_RunningToplevelHandlers = true;
     while(h) {
-	Rf_RemovedToplevelHandlers = FALSE;
-	Rf_DoRemoveCurrentToplevelHandler = FALSE;
+	Rf_RemovedToplevelHandlers = false;
+	Rf_DoRemoveCurrentToplevelHandler = false;
 	Rf_CurrentToplevelHandler = h;
 	again = (h->cb)(expr, value, succeeded, visible, h->data);
 	Rf_CurrentToplevelHandler = NULL;
 
 	if (Rf_DoRemoveCurrentToplevelHandler) {
 	    /* the handler attempted to remove itself, PR#18508 */
-	    Rf_DoRemoveCurrentToplevelHandler = FALSE;
-	    again = FALSE;
+	    Rf_DoRemoveCurrentToplevelHandler = false;
+	    again = false;
 	}
 	if (Rf_RemovedToplevelHandlers) {
 	    /* some handlers were removed, but not "h" -> recompute "prev" */
@@ -1876,7 +1876,7 @@ Rf_callToplevelHandlers(SEXP expr, SEXP value, Rboolean succeeded,
 	}
     }
 
-    Rf_RunningToplevelHandlers = FALSE;
+    Rf_RunningToplevelHandlers = false;
 }
 
 
@@ -1886,9 +1886,9 @@ static void defineVarInc(SEXP sym, SEXP val, SEXP rho)
     INCREMENT_NAMED(val); /* in case this is used in a NAMED build */
 }
 
-attribute_hidden Rboolean
-R_taskCallbackRoutine(SEXP expr, SEXP value, Rboolean succeeded,
-		      Rboolean visible, void *userData)
+attribute_hidden bool
+R_taskCallbackRoutine(SEXP expr, SEXP value, bool succeeded,
+		      bool visible, void *userData)
 {
     /* install some symbols */
     static SEXP R_cbSym = NULL;
@@ -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 = (Rboolean)LOGICAL(VECTOR_ELT(f, 2))[0];
+    bool again, useData = (bool)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,10 +1948,10 @@ 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 = (Rboolean) asLogical(val);
+	again = (bool) asLogical(val);
     } else {
 	/* warning("error occurred in top-level task callback\n"); */
-	again = FALSE;
+	again = false;
     }
 
     UNPROTECT(3); /* rho, e, val */