Daily bump.

[pf3gnuchains/gcc-fork.git] / gcc / diagnostic.h

diff --git a/gcc/diagnostic.h b/gcc/diagnostic.h
index 242cf47..89c1271 100644 (file)
--- a/gcc/diagnostic.h
+++ b/gcc/diagnostic.h
@@ -1,13 +1,13 @@
 /* Various declarations for language-independent diagnostics subroutines.
 /* Various declarations for language-independent diagnostics subroutines.

-   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005
-   Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+   2010, Free Software Foundation, Inc.

    Contributed by Gabriel Dos Reis <gdr@codesourcery.com>
 
 This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
    Contributed by Gabriel Dos Reis <gdr@codesourcery.com>
 
 This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

-Software Foundation; either version 2, or (at your option) any later
+Software Foundation; either version 3, or (at your option) any later

 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY
 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY


@@ -16,19 +16,19 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License

-along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301, USA.  */
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */

 
 #ifndef GCC_DIAGNOSTIC_H
 #define GCC_DIAGNOSTIC_H
 
 #include "pretty-print.h"
 
 #ifndef GCC_DIAGNOSTIC_H
 #define GCC_DIAGNOSTIC_H
 
 #include "pretty-print.h"

+#include "options.h"

 
 /* Constants used to discriminate diagnostics.  */
 typedef enum
 {
 
 /* Constants used to discriminate diagnostics.  */
 typedef enum
 {

-#define DEFINE_DIAGNOSTIC_KIND(K, msgid) K,  
+#define DEFINE_DIAGNOSTIC_KIND(K, msgid) K,

 #include "diagnostic.def"
 #undef DEFINE_DIAGNOSTIC_KIND
   DK_LAST_DIAGNOSTIC_KIND
 #include "diagnostic.def"
 #undef DEFINE_DIAGNOSTIC_KIND
   DK_LAST_DIAGNOSTIC_KIND


@@ -37,19 +37,19 @@ typedef enum
 /* 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
    list in diagnostic.def.  */
 /* 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
    list in diagnostic.def.  */

-typedef struct
+typedef struct diagnostic_info

 {
   text_info message;
   location_t location;
 {
   text_info message;
   location_t location;

+  unsigned int override_column;
+  /* Auxiliary data for client.  */
+  void *x_data;

   /* The kind of diagnostic it is about.  */
   diagnostic_t kind;
   /* Which OPT_* directly controls this diagnostic.  */
   int option_index;
 } diagnostic_info;
 
   /* The kind of diagnostic it is about.  */
   diagnostic_t kind;
   /* Which OPT_* directly controls this diagnostic.  */
   int option_index;
 } diagnostic_info;
 

-#define pedantic_error_kind() (flag_pedantic_errors ? DK_ERROR : DK_WARNING)
-
-

 /*  Forward declarations.  */
 typedef struct diagnostic_context diagnostic_context;
 typedef void (*diagnostic_starter_fn) (diagnostic_context *,
 /*  Forward declarations.  */
 typedef struct diagnostic_context diagnostic_context;
 typedef void (*diagnostic_starter_fn) (diagnostic_context *,


@@ -68,11 +68,18 @@ struct diagnostic_context
 
   /* True if we should display the "warnings are being tread as error"
      message, usually displayed once per compiler run.  */
 
   /* True if we should display the "warnings are being tread as error"
      message, usually displayed once per compiler run.  */

-  bool issue_warnings_are_errors_message;
-  
+  bool some_warnings_are_errors;
+

   /* True if it has been requested that warnings be treated as errors.  */
   bool warning_as_error_requested;
 
   /* 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 <options.h>.  */
+  diagnostic_t classify_diagnostic[N_OPTS];
+

   /* True if we should print the command line option which controls
      each diagnostic, if known.  */
   bool show_option_requested;
   /* True if we should print the command line option which controls
      each diagnostic, if known.  */
   bool show_option_requested;


@@ -95,17 +102,25 @@ struct diagnostic_context
   /* Client hook to report an internal error.  */
   void (*internal_error) (const char *, va_list *);
 
   /* Client hook to report an internal error.  */
   void (*internal_error) (const char *, va_list *);
 

-  /* Function of last diagnostic message; more generally, function such that
-     if next diagnostic message is in it then we don't have to mention the
-     function name.  */
-  tree last_function;
+  /* Auxiliary data for client.  */
+  void *x_data;

 
 

-  /* Used to detect when input_file_stack has changed since last described.  */
-  int last_module;
+  /* Used to detect when the input file stack has changed since last
+     described.  */
+  const struct line_map *last_module;

 
   int lock;
 
   int lock;

+
+  bool inhibit_notes_p;

 };
 
 };
 

+static inline void
+diagnostic_inhibit_notes (diagnostic_context * context)
+{
+  context->inhibit_notes_p = true;
+}
+
+

 /* Client supplied function to announce a diagnostic.  */
 #define diagnostic_starter(DC) (DC)->begin_diagnostic
 
 /* Client supplied function to announce a diagnostic.  */
 #define diagnostic_starter(DC) (DC)->begin_diagnostic
 


@@ -113,8 +128,9 @@ struct diagnostic_context
    displayed.  */
 #define diagnostic_finalizer(DC) (DC)->end_diagnostic
 
    displayed.  */
 #define diagnostic_finalizer(DC) (DC)->end_diagnostic
 

-/* Extension hook for client.  */
-#define diagnostic_auxiliary_data(DC) (DC)->x_data
+/* Extension hooks for client.  */
+#define diagnostic_context_auxiliary_data(DC) (DC)->x_data
+#define diagnostic_info_auxiliary_data(DI) (DI)->x_data

 
 /* Same as pp_format_decoder.  Works on 'diagnostic_context *'.  */
 #define diagnostic_format_decoder(DC) ((DC)->printer->format_decoder)
 
 /* Same as pp_format_decoder.  Works on 'diagnostic_context *'.  */
 #define diagnostic_format_decoder(DC) ((DC)->printer->format_decoder)


@@ -128,25 +144,15 @@ struct diagnostic_context
 
 #define diagnostic_flush_buffer(DC) pp_base_flush ((DC)->printer)
 
 
 #define diagnostic_flush_buffer(DC) pp_base_flush ((DC)->printer)
 

-/* True if the last function in which a diagnostic was reported is
-   different from the current one.  */
-#define diagnostic_last_function_changed(DC) \
-  ((DC)->last_function != current_function_decl)
-
-/* Remember the current function as being the last one in which we report
-   a diagnostic.  */
-#define diagnostic_set_last_function(DC) \
-  (DC)->last_function = current_function_decl
-

 /* True if the last module or file in which a diagnostic was reported is
    different from the current one.  */
 /* True if the last module or file in which a diagnostic was reported is
    different from the current one.  */

-#define diagnostic_last_module_changed(DC) \
-  ((DC)->last_module != input_file_stack_tick)
+#define diagnostic_last_module_changed(DC, MAP)        \
+  ((DC)->last_module != MAP)

 
 /* Remember the current module or file as being the last one in which we
    report a diagnostic.  */
 
 /* Remember the current module or file as being the last one in which we
    report a diagnostic.  */

-#define diagnostic_set_last_module(DC) \
-  (DC)->last_module = input_file_stack_tick
+#define diagnostic_set_last_module(DC, MAP)    \
+  (DC)->last_module = MAP

 
 /* Raise SIGABRT on any diagnostic of severity DK_ERROR or higher.  */
 #define diagnostic_abort_on_error(DC) \
 
 /* Raise SIGABRT on any diagnostic of severity DK_ERROR or higher.  */
 #define diagnostic_abort_on_error(DC) \


@@ -169,17 +175,31 @@ extern diagnostic_context *global_dc;
 #define sorrycount diagnostic_kind_count (global_dc, DK_SORRY)
 
 /* Returns nonzero if warnings should be emitted.  */
 #define sorrycount diagnostic_kind_count (global_dc, DK_SORRY)
 
 /* Returns nonzero if warnings should be emitted.  */

-#define diagnostic_report_warnings_p()                 \
+#define diagnostic_report_warnings_p(LOC)                      \

   (!inhibit_warnings                                   \
   (!inhibit_warnings                                   \

-   && !(in_system_header && !warn_system_headers))
+   && !(in_system_header_at (LOC) && !warn_system_headers))

 
 #define report_diagnostic(D) diagnostic_report_diagnostic (global_dc, D)
 
 
 #define report_diagnostic(D) diagnostic_report_diagnostic (global_dc, D)
 

+/* Override the column number to be used for reporting a
+   diagnostic.  */
+#define diagnostic_override_column(DI, COL) (DI)->override_column = (COL)
+
+/* Override the option index to be used for reporting a
+   diagnostic.  */
+#define diagnostic_override_option_index(DI, OPTIDX) \
+    ((DI)->option_index = (OPTIDX))
+

 /* Diagnostic related functions.  */
 extern void diagnostic_initialize (diagnostic_context *);
 /* Diagnostic related functions.  */
 extern void diagnostic_initialize (diagnostic_context *);

+extern void diagnostic_finish (diagnostic_context *);

 extern void diagnostic_report_current_module (diagnostic_context *);
 extern void diagnostic_report_current_module (diagnostic_context *);

-extern void diagnostic_report_current_function (diagnostic_context *);
-extern void diagnostic_report_diagnostic (diagnostic_context *,
+
+/* Force diagnostics controlled by OPTIDX to be kind KIND.  */
+extern diagnostic_t diagnostic_classify_diagnostic (diagnostic_context *,
+                                                   int /* optidx */,
+                                                   diagnostic_t /* kind */);
+extern bool diagnostic_report_diagnostic (diagnostic_context *,

                                          diagnostic_info *);
 #ifdef ATTRIBUTE_GCC_DIAG
 extern void diagnostic_set_info (diagnostic_info *, const char *, va_list *,
                                          diagnostic_info *);
 #ifdef ATTRIBUTE_GCC_DIAG
 extern void diagnostic_set_info (diagnostic_info *, const char *, va_list *,


@@ -188,21 +208,14 @@ extern void diagnostic_set_info_translated (diagnostic_info *, const char *,
                                            va_list *, location_t,
                                            diagnostic_t)
      ATTRIBUTE_GCC_DIAG(2,0);
                                            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_info *);
 #endif
 extern char *diagnostic_build_prefix (diagnostic_info *);

+void default_diagnostic_starter (diagnostic_context *, diagnostic_info *);
+void default_diagnostic_finalizer (diagnostic_context *, diagnostic_info *);

 
 /* Pure text formatting support functions.  */
 extern char *file_name_as_prefix (const char *);
 
 
 /* Pure text formatting support functions.  */
 extern char *file_name_as_prefix (const char *);
 

-/* In tree-pretty-print.c  */
-extern int dump_generic_node (pretty_printer *, tree, int, int, bool);
-extern void print_generic_stmt (FILE *, tree, int);
-extern void print_generic_stmt_indented (FILE *, tree, int, int);
-extern void print_generic_expr (FILE *, tree, int);
-extern void print_generic_decl (FILE *, tree, int);
-
-extern void debug_generic_expr (tree);
-extern void debug_generic_stmt (tree);
-extern void debug_tree_chain (tree);
-extern void debug_c_tree (tree);

 #endif /* ! GCC_DIAGNOSTIC_H */
 #endif /* ! GCC_DIAGNOSTIC_H */