diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2010-05-24 19:55:44 +0100 |
|---|---|---|
| committer | Joseph Myers <jsm28@gcc.gnu.org> | 2010-05-24 19:55:44 +0100 |
| commit | 243fbddd9c886159b7461867c84db564e0b5b0b0 (patch) | |
| tree | d6028a1f52919db5575cd7449139f2ab89757163 /gcc/cp/error.c | |
| parent | 611d6f76fe8eae737566fb809f61b0c094ef92c9 (diff) | |
| download | gcc-243fbddd9c886159b7461867c84db564e0b5b0b0.tar.gz | |
diagnostic.c: Don't include flags.h.
* diagnostic.c: Don't include flags.h.
(pedantic_warning_kind, permissive_error_kind): Take diagnostic
context parameters. Check flags in the context passed as a
parameter.
(diagnostic_build_prefix): Add context parameter. Check
show_column flag in context.
(diagnostic_action_after_output): Check fatal_errors flag in
context.
(diagnostic_report_current_module): Check show_column flag in
context.
(default_diagnostic_starter): Update call to
diagnostic_build_prefix.
(diagnostic_report_diagnostic): Pass context to
pedantic_warning_kind.
(emit_diagnostic): Pass context to permissive_error_kind.
(permerror): Pass context to permissive_error_kind.
* diagnostic.h (struct diagnostic_context): Add show_column,
pedantic_errors, permissive and fatal_errors fields.
(diagnostic_build_prefix): Update prototype.
* langhooks.c
* toplev.c (process_options): Set flags in global_dc from
flag_show_column, flag_pedantic_errors, flag_permissive,
flag_fatal_errors.
* tree-diagnostic.c (default_tree_diagnostic_starter): Update call
to diagnostic_build_prefix.
* Makefile.in (diagnostic.o): Update dependencies.
cp:
* error.c (cp_diagnostic_starter): Update call to
diagnostic_build_prefix.
(cp_print_error_function,
print_instantiation_partial_context_line): Check show_column flag
in context.
From-SVN: r159793
Diffstat (limited to 'gcc/cp/error.c')
| -rw-r--r-- | gcc/cp/error.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gcc/cp/error.c b/gcc/cp/error.c index dcdfe8921b2..592f360001a 100644 --- a/gcc/cp/error.c +++ b/gcc/cp/error.c @@ -2550,7 +2550,8 @@ cp_diagnostic_starter (diagnostic_context *context, diagnostic_report_current_module (context); cp_print_error_function (context, diagnostic); maybe_print_instantiation_context (context); - pp_base_set_prefix (context->printer, diagnostic_build_prefix (diagnostic)); + pp_base_set_prefix (context->printer, diagnostic_build_prefix (context, + diagnostic)); } static void @@ -2644,7 +2645,7 @@ cp_print_error_function (diagnostic_context *context, pp_base_newline (context->printer); if (s.file != NULL) { - if (flag_show_column && s.column != 0) + if (context->show_column && s.column != 0) pp_printf (context->printer, _(" inlined from %qs at %s:%d:%d"), cxx_printable_name_translate (fndecl, 2), @@ -2750,7 +2751,7 @@ print_instantiation_partial_context_line (diagnostic_context *context, const char *str; str = decl_as_string_translate (t->decl, TFF_DECL_SPECIFIERS | TFF_RETURN_TYPE); - if (flag_show_column) + if (context->show_column) pp_verbatim (context->printer, recursive_p ? _("%s:%d:%d: recursively instantiated from %qs\n") @@ -2765,7 +2766,7 @@ print_instantiation_partial_context_line (diagnostic_context *context, } else { - if (flag_show_column) + if (context->show_column) pp_verbatim (context->printer, recursive_p ? _("%s:%d:%d: recursively instantiated from here") @@ -2816,7 +2817,7 @@ print_instantiation_partial_context (diagnostic_context *context, { expanded_location xloc; xloc = expand_location (loc); - if (flag_show_column) + if (context->show_column) pp_verbatim (context->printer, _("%s:%d:%d: [ skipping %d instantiation contexts ]\n"), xloc.file, xloc.line, xloc.column, skip); |