X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fdiagnostic.h;h=4b1265b78868e3f995f8dd67e79a81b6636b1bab;hb=e6c80a80e7e5827932e5b981ee24798b607fca3e;hp=9fd508b78ff15f044ac1eb37cb4e0e92cd7e66e2;hpb=1f63d33764ca742bf167b8f4f42ca6e19e355a3b;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/diagnostic.h b/gcc/diagnostic.h index 9fd508b78ff..4b1265b7886 100644 --- a/gcc/diagnostic.h +++ b/gcc/diagnostic.h @@ -23,16 +23,7 @@ along with GCC; see the file COPYING3. If not see #define GCC_DIAGNOSTIC_H #include "pretty-print.h" -#include "options.h" - -/* Constants used to discriminate diagnostics. */ -typedef enum -{ -#define DEFINE_DIAGNOSTIC_KIND(K, msgid) K, -#include "diagnostic.def" -#undef DEFINE_DIAGNOSTIC_KIND - DK_LAST_DIAGNOSTIC_KIND -} diagnostic_t; +#include "diagnostic-core.h" /* A diagnostic is described by the MESSAGE to send, the FILE and LINE of its context and its KIND (ice, error, warning, note, ...) See complete @@ -50,8 +41,17 @@ typedef struct diagnostic_info int option_index; } diagnostic_info; +/* Each time a diagnostic's classification is changed with a pragma, + we record the change and the location of the change in an array of + these structs. */ +typedef struct diagnostic_classification_change_t +{ + location_t location; + int option; + diagnostic_t kind; +} diagnostic_classification_change_t; + /* Forward declarations. */ -typedef struct diagnostic_context diagnostic_context; typedef void (*diagnostic_starter_fn) (diagnostic_context *, diagnostic_info *); typedef diagnostic_starter_fn diagnostic_finalizer_fn; @@ -73,12 +73,31 @@ struct diagnostic_context /* True if it has been requested that warnings be treated as errors. */ bool warning_as_error_requested; - /* For each option index that can be passed to warning() et all - (OPT_* from options.h), this array may contain a new kind that - the diagnostic should be changed to before reporting, or - DK_UNSPECIFIED to leave it as the reported kind, or DK_IGNORED to - not report it at all. N_OPTS is from . */ - diagnostic_t classify_diagnostic[N_OPTS]; + /* The number of option indexes that can be passed to warning() et + al. */ + int n_opts; + + /* For each option index that can be passed to warning() et al + (OPT_* from options.h when using this code with the core GCC + options), this array may contain a new kind that the diagnostic + should be changed to before reporting, or DK_UNSPECIFIED to leave + it as the reported kind, or DK_IGNORED to not report it at + all. */ + diagnostic_t *classify_diagnostic; + + /* History of all changes to the classifications above. This list + is stored in location-order, so we can search it, either + binary-wise or end-to-front, to find the most recent + classification for a given diagnostic, given the location of the + diagnostic. */ + diagnostic_classification_change_t *classification_history; + + /* The size of the above array. */ + int n_classification_history; + + /* For pragma push/pop. */ + int *push_list; + int n_push; /* True if we should print the command line option which controls each diagnostic, if known. */ @@ -96,9 +115,22 @@ struct diagnostic_context /* True if permerrors are warnings. */ bool permissive; + /* The index of the option to associate with turning permerrors into + warnings. */ + int opt_permissive; + /* True if errors are fatal. */ bool fatal_errors; + /* True if all warnings should be disabled. */ + bool dc_inhibit_warnings; + + /* True if warnings should be given in system headers. */ + bool dc_warn_system_headers; + + /* Maximum number of errors to report. */ + unsigned int max_errors; + /* This function is called before any message is printed out. It is responsible for preparing message prefix and such. For example, it might say: @@ -114,6 +146,22 @@ struct diagnostic_context /* Client hook to report an internal error. */ void (*internal_error) (diagnostic_context *, const char *, va_list *); + /* Client hook to say whether the option controlling a diagnostic is + enabled. Returns nonzero if enabled, zero if disabled. */ + int (*option_enabled) (int, void *); + + /* Client information to pass as second argument to + option_enabled. */ + void *option_state; + + /* Client hook to return the name of an option that controls a + diagnostic. Returns malloced memory. The first diagnostic_t + argument is the kind of diagnostic before any reclassification + (of warnings as errors, etc.); the second is the kind after any + reclassification. May return NULL if no name is to be printed. + May be passed 0 as well as the index of a particular option. */ + char *(*option_name) (diagnostic_context *, int, diagnostic_t, diagnostic_t); + /* Auxiliary data for client. */ void *x_data; @@ -187,9 +235,9 @@ extern diagnostic_context *global_dc; #define sorrycount diagnostic_kind_count (global_dc, DK_SORRY) /* Returns nonzero if warnings should be emitted. */ -#define diagnostic_report_warnings_p(LOC) \ - (!inhibit_warnings \ - && !(in_system_header_at (LOC) && !warn_system_headers)) +#define diagnostic_report_warnings_p(DC, LOC) \ + (!(DC)->dc_inhibit_warnings \ + && !(in_system_header_at (LOC) && !(DC)->dc_warn_system_headers)) #define report_diagnostic(D) diagnostic_report_diagnostic (global_dc, D) @@ -203,14 +251,17 @@ extern diagnostic_context *global_dc; ((DI)->option_index = (OPTIDX)) /* Diagnostic related functions. */ -extern void diagnostic_initialize (diagnostic_context *); +extern void diagnostic_initialize (diagnostic_context *, int); extern void diagnostic_finish (diagnostic_context *); -extern void diagnostic_report_current_module (diagnostic_context *); +extern void diagnostic_report_current_module (diagnostic_context *, location_t); /* Force diagnostics controlled by OPTIDX to be kind KIND. */ extern diagnostic_t diagnostic_classify_diagnostic (diagnostic_context *, int /* optidx */, - diagnostic_t /* kind */); + diagnostic_t /* kind */, + location_t); +extern void diagnostic_push_diagnostics (diagnostic_context *, location_t); +extern void diagnostic_pop_diagnostics (diagnostic_context *, location_t); extern bool diagnostic_report_diagnostic (diagnostic_context *, diagnostic_info *); #ifdef ATTRIBUTE_GCC_DIAG @@ -220,8 +271,6 @@ extern void diagnostic_set_info_translated (diagnostic_info *, const char *, va_list *, location_t, diagnostic_t) ATTRIBUTE_GCC_DIAG(2,0); -extern bool emit_diagnostic (diagnostic_t, location_t, int, - const char *, ...) ATTRIBUTE_GCC_DIAG(4,5); #endif extern char *diagnostic_build_prefix (diagnostic_context *, diagnostic_info *); void default_diagnostic_starter (diagnostic_context *, diagnostic_info *);