diff options
| author | Zack Weinberg <zack@gcc.gnu.org> | 2003-05-12 18:32:18 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2003-05-12 18:32:18 +0000 |
| commit | 9804f5fb8bc09df63c51d2e2d0fa4d4abddd5f2b (patch) | |
| tree | 4dbeae77a93be9438a393a37aaff294b1a1f9abf /gcc/f | |
| parent | 5560b019e4e1d6f86fe4ad1166e3a0c16fff699a (diff) | |
| download | gcc-9804f5fb8bc09df63c51d2e2d0fa4d4abddd5f2b.zip gcc-9804f5fb8bc09df63c51d2e2d0fa4d4abddd5f2b.tar.gz gcc-9804f5fb8bc09df63c51d2e2d0fa4d4abddd5f2b.tar.bz2 | |
diagnostic.c (diagnostic_for_decl): Take a diagnostic_context argument.
* diagnostic.c (diagnostic_for_decl): Take a
diagnostic_context argument. Restructure to be consistent
with diagnostic_report_diagnostic.
(diagnostic_count_diagnostic): Now static. Take a
diagnostic_info argument, not just a diagnostic_t. Some code
moved here from internal_error. Move a case label for
clarity.
(diagnostic_action_after_output): New function. Code moved
here from internal_error and fatal_error.
(bug_report_request): New #define so that this text appears in
only one place.
(diagnostic_report_diagnostic): Update to match changes to
diagnostic_count_diagnostic. Call diagnostic_action_after_output.
(diagnostic_set_info): Call gettext here.
(pedwarn): Update comment. Don't call gettext here.
(sorry): Use report_diagnostic. Don't call gettext here.
(fatal_error): Remove final fnotice and exit, but call
real_abort to prevent warnings about noreturn function returning.
(internal_error): Likewise. Don't do ICE suppression here nor
call context->internal_error.
(warning_with_decl): Suppress for decls in system headers.
Adjust call to diagnostic_for_decl.
(pedwarn_with_decl): Likewise.
(error_with_decl): Adjust call to diagnostic_for_decl.
(error_recursion): Use bug_report_request.
* diagnostic.h: Remove prototype of diagnostic_count_diagnostic.
* objc/objc-act.c (error_with_ivar, warn_with_method): Don't call
diagnostic_count_diagnostic.
f:
* bad.c: Don't call diagnostic_count_diagnostic.
From-SVN: r66728
Diffstat (limited to 'gcc/f')
| -rw-r--r-- | gcc/f/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/f/bad.c | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog index a57818ff..94d1eb1 100644 --- a/gcc/f/ChangeLog +++ b/gcc/f/ChangeLog @@ -1,3 +1,7 @@ +2003-05-12 Zack Weinberg <zack@codesourcery.com> + + * bad.c: Don't call diagnostic_count_diagnostic. + 2003-05-12 Roger Sayle <roger@eyesopen.com> * com.c (ffecom_init_0): Define built-in functions for atan2, @@ -78,7 +82,7 @@ * lex.c (ffelex_file_pop_): Rename parameter from input_filename. (ffelex_file_push_): Likewise. - + * ste.c (struct gbe_block): Rename field from input_filename. (ffeste_start_block_, ffeste_start_stmt_): Likewise. diff --git a/gcc/f/bad.c b/gcc/f/bad.c index 21fa4871..deed124 100644 --- a/gcc/f/bad.c +++ b/gcc/f/bad.c @@ -203,11 +203,12 @@ ffebad_start_ (bool lex_override, ffebad errnum, ffebadSeverity sev, if ((ffebad_severity_ != FFEBAD_severityPEDANTIC) || !flag_pedantic_errors) { - if (!diagnostic_count_diagnostic (global_dc, DK_WARNING)) + if (!diagnostic_report_warnings_p ()) { /* User wants no warnings. */ ffebad_is_temp_inhibited_ = TRUE; return FALSE; } + diagnostic_kind_count (global_dc, DK_WARNING)++; break; } /* Fall through (PEDANTIC && flag_pedantic_errors). */ @@ -215,7 +216,7 @@ ffebad_start_ (bool lex_override, ffebad errnum, ffebadSeverity sev, case FFEBAD_severityWEIRD: case FFEBAD_severitySEVERE: case FFEBAD_severityDISASTER: - diagnostic_count_diagnostic (global_dc, DK_ERROR); + diagnostic_kind_count (global_dc, DK_ERROR)++; break; default: |