Re: [Patch, Fortran, committed] bool cleanup in error.c

[Tobias Burnus]

Tobias Burnus wrote:

Tobias Burnus wrote:

This patch does a cleanup in error.c; it changes come "int" values to "bool" – based on Manuel's RFC patch – and it consolidates two buffers flags.

Committed as Rev. 218449 as obvious.

And some more; committed as Rev. 218450.

I forgot to attach the patch.

Tobias

Index: gcc/fortran/ChangeLog
===================================================================
--- gcc/fortran/ChangeLog	(Revision 218449)
+++ gcc/fortran/ChangeLog	(Arbeitskopie)
@@ -1,4 +1,12 @@
 2014-12-06  Tobias Burnus  <bur...@net-b.de>
+
+	* error.c (gfc_error_check): Use bool not int.
+	* gfortran.h (gfc_error_check): Update prototype.
+	* match.c (gfc_match_if): Update call.
+	* parse.c (decode_statement, decode_omp_directive,
+	decode_gcc_attribute): Ditto.
+
+2014-12-06  Tobias Burnus  <bur...@net-b.de>
 	    Manuel López-Ibáñez  <m...@gcc.gnu.org>
 
 	* error.c (gfc_buffer_error, gfc_error_flag_test): Use bool not int.
Index: gcc/fortran/error.c
===================================================================
--- gcc/fortran/error.c	(Revision 218449)
+++ gcc/fortran/error.c	(Arbeitskopie)
@@ -1440,14 +1440,12 @@ gfc_error_flag_test (void)
 /* Check to see if any errors have been saved.
    If so, print the error.  Returns the state of error_flag.  */
 
-int
+bool
 gfc_error_check (void)
 {
-  int rc;
+  bool error_raised = (bool) error_buffer.flag;
 
-  rc = error_buffer.flag;
-
-  if (error_buffer.flag)
+  if (error_raised)
     {
       if (error_buffer.message != NULL)
 	fputs (error_buffer.message, stderr);
@@ -1459,7 +1457,7 @@ gfc_error_check (void)
 	exit (FATAL_EXIT_CODE);
     }
 
-  return rc;
+  return error_raised;
 }
 
 
Index: gcc/fortran/gfortran.h
===================================================================
--- gcc/fortran/gfortran.h	(Revision 218449)
+++ gcc/fortran/gfortran.h	(Arbeitskopie)
@@ -2688,7 +2688,7 @@ void gfc_error_now (const char *, ...) ATTRIBUTE_G
 void gfc_fatal_error (const char *, ...) ATTRIBUTE_NORETURN ATTRIBUTE_GCC_GFC(1,2);
 void gfc_internal_error (const char *, ...) ATTRIBUTE_NORETURN ATTRIBUTE_GCC_GFC(1,2);
 void gfc_clear_error (void);
-int gfc_error_check (void);
+bool gfc_error_check (void);
 bool gfc_error_flag_test (void);
 
 notification gfc_notification_std (int);
Index: gcc/fortran/match.c
===================================================================
--- gcc/fortran/match.c	(Revision 218449)
+++ gcc/fortran/match.c	(Arbeitskopie)
@@ -1497,7 +1497,7 @@ gfc_match_if (gfc_statement *if_type)
 
   /* All else has failed, so give up.  See if any of the matchers has
      stored an error message of some sort.  */
-  if (gfc_error_check () == 0)
+  if (!gfc_error_check ())
     gfc_error ("Unclassifiable statement in IF-clause at %C");
 
   gfc_free_expr (expr);
Index: gcc/fortran/parse.c
===================================================================
--- gcc/fortran/parse.c	(Revision 218449)
+++ gcc/fortran/parse.c	(Arbeitskopie)
@@ -549,7 +549,7 @@ decode_statement (void)
   /* All else has failed, so give up.  See if any of the matchers has
      stored an error message of some sort.  */
 
-  if (gfc_error_check () == 0)
+  if (!gfc_error_check ())
     gfc_error_now ("Unclassifiable statement at %C");
 
   reject_statement ();
@@ -769,7 +769,7 @@ decode_omp_directive (void)
 
   if (gfc_option.gfc_flag_openmp || simd_matched)
     {
-      if (gfc_error_check () == 0)
+      if (!gfc_error_check ())
 	gfc_error_now ("Unclassifiable OpenMP directive at %C");
     }
 
@@ -796,7 +796,7 @@ decode_gcc_attribute (void)
   /* All else has failed, so give up.  See if any of the matchers has
      stored an error message of some sort.  */
 
-  if (gfc_error_check () == 0)
+  if (!gfc_error_check ())
     gfc_error_now ("Unclassifiable GCC directive at %C");
 
   reject_statement ();