X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fdiagnostic.c;h=2bdeb88185817cda423be5acd4fc89c21d5bcf7d;hb=db35a7f00d5fa55c81e2d0e45fa57524f2b7fb38;hp=54c2da7437457b8ef15c14b5412cc4defcc24e99;hpb=e8fc0d3480bf8f266db2caa965af50776e270ec9;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/diagnostic.c b/gcc/diagnostic.c index 54c2da74374..2bdeb881858 100644 --- a/gcc/diagnostic.c +++ b/gcc/diagnostic.c @@ -1,6 +1,6 @@ /* Language-independent diagnostic subroutines for the GNU Compiler Collection - Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 - Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, + 2009 Free Software Foundation, Inc. Contributed by Gabriel Dos Reis This file is part of GCC. @@ -40,6 +40,7 @@ along with GCC; see the file COPYING3. If not see #include "langhooks.h" #include "langhooks-def.h" #include "opts.h" +#include "plugin.h" #define pedantic_warning_kind() (flag_pedantic_errors ? DK_ERROR : DK_WARNING) #define permissive_error_kind() (flag_permissive ? DK_WARNING : DK_ERROR) @@ -47,11 +48,6 @@ along with GCC; see the file COPYING3. If not see /* Prototypes. */ static char *build_message_string (const char *, ...) ATTRIBUTE_PRINTF_1; -static void default_diagnostic_starter (diagnostic_context *, - diagnostic_info *); -static void default_diagnostic_finalizer (diagnostic_context *, - diagnostic_info *); - static void error_recursion (diagnostic_context *) ATTRIBUTE_NORETURN; static void diagnostic_action_after_output (diagnostic_context *, @@ -113,6 +109,7 @@ diagnostic_initialize (diagnostic_context *context) context->last_module = 0; context->last_function = NULL; context->lock = 0; + context->inhibit_notes_p = false; } /* Initialize DIAGNOSTIC, where the message MSG has already been @@ -126,6 +123,7 @@ diagnostic_set_info_translated (diagnostic_info *diagnostic, const char *msg, diagnostic->message.args_ptr = args; diagnostic->message.format_spec = msg; diagnostic->location = location; + diagnostic->override_column = 0; diagnostic->kind = kind; diagnostic->option_index = 0; } @@ -153,12 +151,14 @@ diagnostic_build_prefix (diagnostic_info *diagnostic) }; const char *text = _(diagnostic_kind_text[diagnostic->kind]); expanded_location s = expand_location (diagnostic->location); + if (diagnostic->override_column) + s.column = diagnostic->override_column; gcc_assert (diagnostic->kind < DK_LAST_DIAGNOSTIC_KIND); return (s.file == NULL ? build_message_string ("%s: %s", progname, text) - : flag_show_column && s.column != 0 + : flag_show_column ? build_message_string ("%s:%d:%d: %s", s.file, s.line, s.column, text) : build_message_string ("%s:%d: %s", s.file, s.line, text)); } @@ -240,9 +240,15 @@ diagnostic_report_current_module (diagnostic_context *context) if (! MAIN_FILE_P (map)) { map = INCLUDED_FROM (line_table, map); - pp_verbatim (context->printer, - "In file included from %s:%d", - map->to_file, LAST_SOURCE_LINE (map)); + if (flag_show_column) + pp_verbatim (context->printer, + "In file included from %s:%d:%d", + map->to_file, + LAST_SOURCE_LINE (map), LAST_SOURCE_COLUMN (map)); + else + pp_verbatim (context->printer, + "In file included from %s:%d", + map->to_file, LAST_SOURCE_LINE (map)); while (! MAIN_FILE_P (map)) { map = INCLUDED_FROM (line_table, map); @@ -256,7 +262,7 @@ diagnostic_report_current_module (diagnostic_context *context) } } -static void +void default_diagnostic_starter (diagnostic_context *context, diagnostic_info *diagnostic) { @@ -264,7 +270,7 @@ default_diagnostic_starter (diagnostic_context *context, pp_set_prefix (context->printer, diagnostic_build_prefix (diagnostic)); } -static void +void default_diagnostic_finalizer (diagnostic_context *context, diagnostic_info *diagnostic ATTRIBUTE_UNUSED) { @@ -295,7 +301,7 @@ diagnostic_classify_diagnostic (diagnostic_context *context, DC. This function is *the* subroutine in terms of which front-ends should implement their specific diagnostic handling modules. The front-end independent format specifiers are exactly those described - in the documentation of output_format. + in the documentation of output_format. Return true if a diagnostic was printed, false otherwise. */ bool @@ -312,9 +318,12 @@ diagnostic_report_diagnostic (diagnostic_context *context, && !diagnostic_report_warnings_p (location)) return false; - if (diagnostic->kind == DK_PEDWARN) + if (diagnostic->kind == DK_PEDWARN) diagnostic->kind = pedantic_warning_kind (); - + + if (diagnostic->kind == DK_NOTE && context->inhibit_notes_p) + return false; + if (context->lock > 0) { /* If we're reporting an ICE in the middle of some other error, @@ -336,7 +345,7 @@ diagnostic_report_diagnostic (diagnostic_context *context, diagnostic->kind = DK_ERROR; maybe_print_warnings_as_errors_message = true; } - + if (diagnostic->option_index) { /* This tests if the user provided the appropriate -Wfoo or @@ -368,7 +377,15 @@ diagnostic_report_diagnostic (diagnostic_context *context, context->lock++; - if (diagnostic->kind == DK_ICE) + if (diagnostic->kind == DK_ICE && plugins_active_p ()) + { + fnotice (stderr, "*** WARNING *** there are active plugins, do not report" + " this as a bug unless you can reproduce it without enabling" + " any plugins.\n"); + dump_active_plugins (stderr); + } + + if (diagnostic->kind == DK_ICE) { #ifndef ENABLE_CHECKING /* When not checking, ICEs are converted to fatal errors when an @@ -389,13 +406,13 @@ diagnostic_report_diagnostic (diagnostic_context *context, diagnostic->message.args_ptr); } ++diagnostic_kind_count (context, diagnostic->kind); - + saved_format_spec = diagnostic->message.format_spec; if (context->show_option_requested && diagnostic->option_index) diagnostic->message.format_spec = ACONCAT ((diagnostic->message.format_spec, " [", cl_options[diagnostic->option_index].opt_text, "]", NULL)); - + diagnostic->message.locus = &diagnostic->location; diagnostic->message.abstract_origin = &diagnostic->abstract_origin; diagnostic->abstract_origin = NULL; @@ -466,7 +483,7 @@ verbatim (const char *gmsgid, ...) } bool -emit_diagnostic (diagnostic_t kind, location_t location, int opt, +emit_diagnostic (diagnostic_t kind, location_t location, int opt, const char *gmsgid, ...) { diagnostic_info diagnostic; @@ -489,22 +506,39 @@ emit_diagnostic (diagnostic_t kind, location_t location, int opt, return report_diagnostic (&diagnostic); } -/* An informative note. Use this for additional details on an error +/* An informative note at LOCATION. Use this for additional details on an error message. */ void -inform (const char *gmsgid, ...) +inform (location_t location, const char *gmsgid, ...) { diagnostic_info diagnostic; va_list ap; va_start (ap, gmsgid); - diagnostic_set_info (&diagnostic, gmsgid, &ap, input_location, DK_NOTE); + diagnostic_set_info (&diagnostic, gmsgid, &ap, location, DK_NOTE); + report_diagnostic (&diagnostic); + va_end (ap); +} + +/* An informative note at LOCATION. Use this for additional details on an + error message. */ +void +inform_n (location_t location, int n, const char *singular_gmsgid, + const char *plural_gmsgid, ...) +{ + diagnostic_info diagnostic; + va_list ap; + + va_start (ap, plural_gmsgid); + diagnostic_set_info_translated (&diagnostic, + ngettext (singular_gmsgid, plural_gmsgid, n), + &ap, location, DK_NOTE); report_diagnostic (&diagnostic); va_end (ap); } /* A warning at INPUT_LOCATION. Use this for code which is correct according - to the relevant language specification but is likely to be buggy anyway. + to the relevant language specification but is likely to be buggy anyway. Returns true if the warning was printed, false if it was inhibited. */ bool warning (int opt, const char *gmsgid, ...) @@ -551,7 +585,7 @@ warning_at (location_t location, int opt, const char *gmsgid, ...) Returns true if the warning was printed, false if it was inhibited. */ bool -pedwarn_at (location_t location, int opt, const char *gmsgid, ...) +pedwarn (location_t location, int opt, const char *gmsgid, ...) { diagnostic_info diagnostic; va_list ap; @@ -563,21 +597,6 @@ pedwarn_at (location_t location, int opt, const char *gmsgid, ...) return report_diagnostic (&diagnostic); } -/* Equivalent to pedwarn_at using INPUT_LOCATION. */ - -bool -pedwarn (int opt, const char *gmsgid, ...) -{ - diagnostic_info diagnostic; - va_list ap; - - va_start (ap, gmsgid); - diagnostic_set_info (&diagnostic, gmsgid, &ap, input_location, DK_PEDWARN); - diagnostic.option_index = opt; - va_end (ap); - return report_diagnostic (&diagnostic); -} - /* A "permissive" error at LOCATION: issues an error unless -fpermissive was given on the command line, in which case it issues a warning. Use this for things that really should be errors but we @@ -586,7 +605,7 @@ pedwarn (int opt, const char *gmsgid, ...) Returns true if the warning was printed, false if it was inhibited. */ bool -permerror_at (location_t location, const char *gmsgid, ...) +permerror (location_t location, const char *gmsgid, ...) { diagnostic_info diagnostic; va_list ap; @@ -599,33 +618,46 @@ permerror_at (location_t location, const char *gmsgid, ...) return report_diagnostic (&diagnostic); } -/* Equivalent to permerror_at (input_location, ...). */ - -bool -permerror (const char *gmsgid, ...) +/* A hard error: the code is definitely ill-formed, and an object file + will not be produced. */ +void +error (const char *gmsgid, ...) { diagnostic_info diagnostic; va_list ap; va_start (ap, gmsgid); - diagnostic_set_info (&diagnostic, gmsgid, &ap, input_location, - permissive_error_kind ()); - diagnostic.option_index = OPT_fpermissive; + diagnostic_set_info (&diagnostic, gmsgid, &ap, input_location, DK_ERROR); + report_diagnostic (&diagnostic); va_end (ap); - return report_diagnostic (&diagnostic); } - /* A hard error: the code is definitely ill-formed, and an object file will not be produced. */ void -error (const char *gmsgid, ...) +error_n (location_t location, int n, const char *singular_gmsgid, + const char *plural_gmsgid, ...) +{ + diagnostic_info diagnostic; + va_list ap; + + va_start (ap, plural_gmsgid); + diagnostic_set_info_translated (&diagnostic, + ngettext (singular_gmsgid, plural_gmsgid, n), + &ap, location, DK_ERROR); + report_diagnostic (&diagnostic); + va_end (ap); +} + +/* Same as ebove, but use location LOC instead of input_location. */ +void +error_at (location_t loc, const char *gmsgid, ...) { diagnostic_info diagnostic; va_list ap; va_start (ap, gmsgid); - diagnostic_set_info (&diagnostic, gmsgid, &ap, input_location, DK_ERROR); + diagnostic_set_info (&diagnostic, gmsgid, &ap, loc, DK_ERROR); report_diagnostic (&diagnostic); va_end (ap); }