diff options
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/cpp.cc | 6 | ||||
| -rw-r--r-- | gcc/fortran/error.cc | 26 | ||||
| -rw-r--r-- | gcc/fortran/options.cc | 3 |
3 files changed, 17 insertions, 18 deletions
diff --git a/gcc/fortran/cpp.cc b/gcc/fortran/cpp.cc index 67e4d4e..02c28a7 100644 --- a/gcc/fortran/cpp.cc +++ b/gcc/fortran/cpp.cc @@ -1084,13 +1084,13 @@ cb_cpp_diagnostic (cpp_reader *pfile ATTRIBUTE_UNUSED, { diagnostic_info diagnostic; diagnostic_t dlevel; - bool save_warn_system_headers = global_dc->dc_warn_system_headers; + bool save_warn_system_headers = global_dc->m_warn_system_headers; bool ret; switch (level) { case CPP_DL_WARNING_SYSHDR: - global_dc->dc_warn_system_headers = 1; + global_dc->m_warn_system_headers = 1; /* Fall through. */ case CPP_DL_WARNING: dlevel = DK_WARNING; @@ -1119,7 +1119,7 @@ cb_cpp_diagnostic (cpp_reader *pfile ATTRIBUTE_UNUSED, cb_cpp_diagnostic_cpp_option (reason)); ret = diagnostic_report_diagnostic (global_dc, &diagnostic); if (level == CPP_DL_WARNING_SYSHDR) - global_dc->dc_warn_system_headers = save_warn_system_headers; + global_dc->m_warn_system_headers = save_warn_system_headers; return ret; } diff --git a/gcc/fortran/error.cc b/gcc/fortran/error.cc index 1b34619..ca31775 100644 --- a/gcc/fortran/error.cc +++ b/gcc/fortran/error.cc @@ -871,7 +871,7 @@ gfc_clear_pp_buffer (output_buffer *this_buffer) pp->buffer = tmp_buffer; /* We need to reset last_location, otherwise we may skip caret lines when we actually give a diagnostic. */ - global_dc->last_location = UNKNOWN_LOCATION; + global_dc->m_last_location = UNKNOWN_LOCATION; } /* The currently-printing diagnostic, for use by gfc_format_decoder, @@ -903,7 +903,7 @@ gfc_warning (int opt, const char *gmsgid, va_list ap) diagnostic_info diagnostic; rich_location rich_loc (line_table, UNKNOWN_LOCATION); - bool fatal_errors = global_dc->fatal_errors; + bool fatal_errors = global_dc->m_fatal_errors; pretty_printer *pp = global_dc->printer; output_buffer *tmp_buffer = pp->buffer; @@ -912,7 +912,7 @@ gfc_warning (int opt, const char *gmsgid, va_list ap) if (buffered_p) { pp->buffer = pp_warning_buffer; - global_dc->fatal_errors = false; + global_dc->m_fatal_errors = false; /* To prevent -fmax-errors= triggering. */ --werrorcount; } @@ -925,7 +925,7 @@ gfc_warning (int opt, const char *gmsgid, va_list ap) if (buffered_p) { pp->buffer = tmp_buffer; - global_dc->fatal_errors = fatal_errors; + global_dc->m_fatal_errors = fatal_errors; warningcount_buffered = 0; werrorcount_buffered = 0; @@ -1156,7 +1156,7 @@ gfc_diagnostic_build_locus_prefix (diagnostic_context *context, ? build_message_string ("%s%s:%s", locus_cs, progname, locus_ce ) : !strcmp (s.file, special_fname_builtin ()) ? build_message_string ("%s%s:%s", locus_cs, s.file, locus_ce) - : context->show_column + : context->m_show_column ? build_message_string ("%s%s:%d:%d:%s", locus_cs, s.file, s.line, s.column, locus_ce) : build_message_string ("%s%s:%d:%s", locus_cs, s.file, s.line, locus_ce)); @@ -1176,7 +1176,7 @@ gfc_diagnostic_build_locus_prefix (diagnostic_context *context, ? build_message_string ("%s%s:%s", locus_cs, progname, locus_ce ) : !strcmp (s.file, special_fname_builtin ()) ? build_message_string ("%s%s:%s", locus_cs, s.file, locus_ce) - : context->show_column + : context->m_show_column ? build_message_string ("%s%s:%d:%d-%d:%s", locus_cs, s.file, s.line, MIN (s.column, s2.column), MAX (s.column, s2.column), locus_ce) @@ -1224,7 +1224,7 @@ gfc_diagnostic_starter (diagnostic_context *context, if (!context->m_source_printing.enabled || diagnostic_location (diagnostic, 0) <= BUILTINS_LOCATION - || diagnostic_location (diagnostic, 0) == context->last_location) + || diagnostic_location (diagnostic, 0) == context->m_last_location) { pp_set_prefix (context->printer, concat (locus_prefix, " ", kind_prefix, NULL)); @@ -1437,7 +1437,7 @@ gfc_error_opt (int opt, const char *gmsgid, va_list ap) diagnostic_info diagnostic; rich_location richloc (line_table, UNKNOWN_LOCATION); - bool fatal_errors = global_dc->fatal_errors; + bool fatal_errors = global_dc->m_fatal_errors; pretty_printer *pp = global_dc->printer; output_buffer *tmp_buffer = pp->buffer; @@ -1447,10 +1447,10 @@ gfc_error_opt (int opt, const char *gmsgid, va_list ap) { /* To prevent -dH from triggering an abort on a buffered error, save abort_on_error and restore it below. */ - saved_abort_on_error = global_dc->abort_on_error; - global_dc->abort_on_error = false; + saved_abort_on_error = global_dc->m_abort_on_error; + global_dc->m_abort_on_error = false; pp->buffer = pp_error_buffer; - global_dc->fatal_errors = false; + global_dc->m_fatal_errors = false; /* To prevent -fmax-errors= triggering, we decrease it before report_diagnostic increases it. */ --errorcount; @@ -1462,8 +1462,8 @@ gfc_error_opt (int opt, const char *gmsgid, va_list ap) if (buffered_p) { pp->buffer = tmp_buffer; - global_dc->fatal_errors = fatal_errors; - global_dc->abort_on_error = saved_abort_on_error; + global_dc->m_fatal_errors = fatal_errors; + global_dc->m_abort_on_error = saved_abort_on_error; } diff --git a/gcc/fortran/options.cc b/gcc/fortran/options.cc index 2ad2247..cfb1957 100644 --- a/gcc/fortran/options.cc +++ b/gcc/fortran/options.cc @@ -389,8 +389,7 @@ gfc_post_options (const char **pfilename) /* Enable -Werror=line-truncation when -Werror and -Wno-error have not been set. */ if (warn_line_truncation && !OPTION_SET_P (warnings_are_errors) - && (global_dc->classify_diagnostic[OPT_Wline_truncation] == - DK_UNSPECIFIED)) + && option_unspecified_p (OPT_Wline_truncation)) diagnostic_classify_diagnostic (global_dc, OPT_Wline_truncation, DK_ERROR, UNKNOWN_LOCATION); } |