Commit b5a9fd3e by Tobias Burnus Committed by Tobias Burnus

error.c (gfc_error_check): Use bool not int.

2014-12-06  Tobias Burnus  <burnus@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.

From-SVN: r218450
parent 0f447a6e
2014-12-06 Tobias Burnus <burnus@net-b.de> 2014-12-06 Tobias Burnus <burnus@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 <burnus@net-b.de>
Manuel López-Ibáñez <manu@gcc.gnu.org> Manuel López-Ibáñez <manu@gcc.gnu.org>
* error.c (gfc_buffer_error, gfc_error_flag_test): Use bool not int. * error.c (gfc_buffer_error, gfc_error_flag_test): Use bool not int.
......
...@@ -1440,14 +1440,12 @@ gfc_error_flag_test (void) ...@@ -1440,14 +1440,12 @@ gfc_error_flag_test (void)
/* Check to see if any errors have been saved. /* Check to see if any errors have been saved.
If so, print the error. Returns the state of error_flag. */ If so, print the error. Returns the state of error_flag. */
int bool
gfc_error_check (void) 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) if (error_buffer.message != NULL)
fputs (error_buffer.message, stderr); fputs (error_buffer.message, stderr);
...@@ -1459,7 +1457,7 @@ gfc_error_check (void) ...@@ -1459,7 +1457,7 @@ gfc_error_check (void)
exit (FATAL_EXIT_CODE); exit (FATAL_EXIT_CODE);
} }
return rc; return error_raised;
} }
......
...@@ -2688,7 +2688,7 @@ void gfc_error_now (const char *, ...) ATTRIBUTE_GCC_GFC(1,2); ...@@ -2688,7 +2688,7 @@ void gfc_error_now (const char *, ...) ATTRIBUTE_GCC_GFC(1,2);
void gfc_fatal_error (const char *, ...) ATTRIBUTE_NORETURN ATTRIBUTE_GCC_GFC(1,2); 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_internal_error (const char *, ...) ATTRIBUTE_NORETURN ATTRIBUTE_GCC_GFC(1,2);
void gfc_clear_error (void); void gfc_clear_error (void);
int gfc_error_check (void); bool gfc_error_check (void);
bool gfc_error_flag_test (void); bool gfc_error_flag_test (void);
notification gfc_notification_std (int); notification gfc_notification_std (int);
......
...@@ -1497,7 +1497,7 @@ gfc_match_if (gfc_statement *if_type) ...@@ -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 /* All else has failed, so give up. See if any of the matchers has
stored an error message of some sort. */ 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_error ("Unclassifiable statement in IF-clause at %C");
gfc_free_expr (expr); gfc_free_expr (expr);
......
...@@ -549,7 +549,7 @@ decode_statement (void) ...@@ -549,7 +549,7 @@ decode_statement (void)
/* All else has failed, so give up. See if any of the matchers has /* All else has failed, so give up. See if any of the matchers has
stored an error message of some sort. */ stored an error message of some sort. */
if (gfc_error_check () == 0) if (!gfc_error_check ())
gfc_error_now ("Unclassifiable statement at %C"); gfc_error_now ("Unclassifiable statement at %C");
reject_statement (); reject_statement ();
...@@ -769,7 +769,7 @@ decode_omp_directive (void) ...@@ -769,7 +769,7 @@ decode_omp_directive (void)
if (gfc_option.gfc_flag_openmp || simd_matched) 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"); gfc_error_now ("Unclassifiable OpenMP directive at %C");
} }
...@@ -796,7 +796,7 @@ decode_gcc_attribute (void) ...@@ -796,7 +796,7 @@ decode_gcc_attribute (void)
/* All else has failed, so give up. See if any of the matchers has /* All else has failed, so give up. See if any of the matchers has
stored an error message of some sort. */ stored an error message of some sort. */
if (gfc_error_check () == 0) if (!gfc_error_check ())
gfc_error_now ("Unclassifiable GCC directive at %C"); gfc_error_now ("Unclassifiable GCC directive at %C");
reject_statement (); reject_statement ();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment