-/* Top level of GNU C compiler
+/* Language-independent diagnostic subroutines for the GNU C compiler
Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+ Contributed by Gabriel Dos Reis <gdr@codesourcery.com>
This file is part of GNU CC.
Boston, MA 02111-1307, USA. */
-/* This file implements the language independant aspect of diagnostic
+/* This file implements the language independent aspect of diagnostic
message module. */
#include "config.h"
#include "insn-config.h"
#include "toplev.h"
#include "intl.h"
-#include "obstack.h"
+#include "diagnostic.h"
#define obstack_chunk_alloc xmalloc
#define obstack_chunk_free free
-struct output_buffer
-{
- struct obstack obstack; /* where we build the text to output */
- const char *prefix; /* prefix of every new line */
- int line_length; /* current line length (in characters) */
- int max_length; /* maximum characters per line */
-};
+#define output_formatted_integer(BUFFER, FORMAT, INTEGER) \
+ do { \
+ sprintf (digit_buffer, FORMAT, INTEGER); \
+ output_add_string (BUFFER, digit_buffer); \
+ } while (0)
-/* Prototypes. */
-static int doing_line_wrapping PARAMS ((void));
-static void init_output_buffer PARAMS ((struct output_buffer*,
- const char *, int));
-static const char *get_output_prefix PARAMS ((const struct output_buffer *));
-static int output_space_left PARAMS ((const struct output_buffer *));
-static void emit_output_prefix PARAMS ((struct output_buffer *));
-static void output_newline PARAMS ((struct output_buffer *));
-static void output_append PARAMS ((struct output_buffer *, const char *,
- const char *));
-static void output_puts PARAMS ((struct output_buffer *, const char *));
-static void dump_output PARAMS ((struct output_buffer *, FILE *));
-static const char *vbuild_message_string PARAMS ((const char *, va_list));
-static const char *build_message_string PARAMS ((const char *, ...));
-static const char *build_location_prefix PARAMS ((const char *, int, int));
-static void voutput_notice PARAMS ((struct output_buffer *, const char *,
- va_list));
-static void output_printf PARAMS ((struct output_buffer *, const char *, ...));
-static void line_wrapper_printf PARAMS ((FILE *, const char *, ...));
-static void vline_wrapper_message_with_location PARAMS ((const char *, int,
- int, const char *,
- va_list));
-static void notice PARAMS ((const char *s, ...)) ATTRIBUTE_PRINTF_1;
-static void v_message_with_file_and_line PARAMS ((const char *, int, int,
- const char *, va_list));
-static void v_message_with_decl PARAMS ((tree, int, const char *, va_list));
-static void file_and_line_for_asm PARAMS ((rtx, char **, int *));
-static void v_error_with_file_and_line PARAMS ((const char *, int,
- const char *, va_list));
-static void v_error_with_decl PARAMS ((tree, const char *, va_list));
-static void v_error_for_asm PARAMS ((rtx, const char *, va_list));
-static void verror PARAMS ((const char *, va_list));
-static void vfatal PARAMS ((const char *, va_list)) ATTRIBUTE_NORETURN;
-static void v_warning_with_file_and_line PARAMS ((const char *, int,
- const char *, va_list));
-static void v_warning_with_decl PARAMS ((tree, const char *, va_list));
-static void v_warning_for_asm PARAMS ((rtx, const char *, va_list));
-static void vwarning PARAMS ((const char *, va_list));
-static void vpedwarn PARAMS ((const char *, va_list));
-static void v_pedwarn_with_decl PARAMS ((tree, const char *, va_list));
-static void v_pedwarn_with_file_and_line PARAMS ((const char *, int,
- const char *, va_list));
-static void vsorry PARAMS ((const char *, va_list));
-static void report_file_and_line PARAMS ((const char *, int, int));
-static void vnotice PARAMS ((FILE *, const char *, va_list));
+#define output_text_length(BUFFER) (BUFFER)->line_length
+#define is_starting_newline(BUFFER) (output_text_length (BUFFER) == 0)
+#define output_prefix(BUFFER) (BUFFER)->state.prefix
+#define line_wrap_cutoff(BUFFER) (BUFFER)->state.maximum_length
+#define ideal_line_wrap_cutoff(BUFFER) (BUFFER)->state.ideal_maximum_length
+#define prefix_was_emitted_for(BUFFER) (BUFFER)->state.emitted_prefix_p
+#define prefixing_policy(BUFFER) (BUFFER)->state.prefixing_rule
+#define output_buffer_ptr_to_format_args(BUFFER) (BUFFER)->state.format_args
+#define diagnostic_args output_buffer_ptr_to_format_args (diagnostic_buffer)
+#define diagnostic_msg output_buffer_text_cursor (diagnostic_buffer)
+
+/* Prototypes. */
+static void finish_diagnostic PARAMS ((void));
+static void output_do_verbatim PARAMS ((output_buffer *,
+ const char *, va_list *));
+static void output_to_stream PARAMS ((output_buffer *, FILE *));
+static void output_format PARAMS ((output_buffer *));
+static void output_indent PARAMS ((output_buffer *));
+
+static char *vbuild_message_string PARAMS ((const char *, va_list))
+ ATTRIBUTE_PRINTF (1, 0);
+static char *build_message_string PARAMS ((const char *, ...))
+ ATTRIBUTE_PRINTF_1;
+static void output_do_printf PARAMS ((output_buffer *, const char *))
+ ATTRIBUTE_PRINTF (2, 0);
+static void format_with_decl PARAMS ((output_buffer *, tree));
+static void file_and_line_for_asm PARAMS ((rtx, const char **, int *));
+static void diagnostic_for_asm PARAMS ((rtx, const char *, va_list *, int));
+static void diagnostic_for_decl PARAMS ((tree, const char *, va_list *, int));
+static void vnotice PARAMS ((FILE *, const char *, va_list))
+ ATTRIBUTE_PRINTF (2, 0);
+static void set_real_maximum_length PARAMS ((output_buffer *));
+
+static void output_unsigned_decimal PARAMS ((output_buffer *, unsigned int));
+static void output_long_decimal PARAMS ((output_buffer *, long int));
+static void output_long_unsigned_decimal PARAMS ((output_buffer *,
+ long unsigned int));
+static void output_octal PARAMS ((output_buffer *, unsigned int));
+static void output_long_octal PARAMS ((output_buffer *, unsigned long int));
+static void output_hexadecimal PARAMS ((output_buffer *, unsigned int));
+static void output_long_hexadecimal PARAMS ((output_buffer *,
+ unsigned long int));
+static void output_append_r PARAMS ((output_buffer *, const char *, int));
+static void wrap_text PARAMS ((output_buffer *, const char *, const char *));
+static void maybe_wrap_text PARAMS ((output_buffer *, const char *,
+ const char *));
+static void clear_diagnostic_info PARAMS ((output_buffer *));
+
+static void default_diagnostic_starter PARAMS ((output_buffer *,
+ diagnostic_context *));
+static void default_diagnostic_finalizer PARAMS ((output_buffer *,
+ diagnostic_context *));
+
+static void error_recursion PARAMS ((void)) ATTRIBUTE_NORETURN;
+static const char *trim_filename PARAMS ((const char *));
extern int rtl_dump_and_exit;
extern int inhibit_warnings;
extern int warningcount;
extern int errorcount;
-static int need_error_newline;
+/* Front-end specific tree formatter, if non-NULL. */
+printer_fn lang_printer = NULL;
+
+/* This must be large enough to hold any printed integer or
+ floating-point value. */
+static char digit_buffer[128];
+
+/* An output_buffer surrogate for stderr. */
+static output_buffer global_output_buffer;
+output_buffer *diagnostic_buffer = &global_output_buffer;
/* Function of last error message;
more generally, function such that if next error message is in it
static int last_error_tick;
/* Called by report_error_function to print out function name.
- * Default may be overridden by language front-ends. */
+ Default may be overridden by language front-ends. */
void (*print_error_function) PARAMS ((const char *)) =
default_print_error_function;
+/* Hooks for language specific diagnostic messages pager and finalizer. */
+diagnostic_starter_fn lang_diagnostic_starter;
+diagnostic_finalizer_fn lang_diagnostic_finalizer;
+
/* Maximum characters per line in automatic line wrapping mode.
- Non Zero means don't wrap lines. */
+ Zero means don't wrap lines. */
+
+int diagnostic_message_length_per_line;
+
+/* Used to control every diagnostic message formatting. Front-ends should
+ call set_message_prefixing_rule to set up their policies. */
+static int current_prefixing_rule;
+
+/* Prevent recursion into the error handler. */
+static int diagnostic_lock;
-static int output_maximum_width = 0;
\f
-/* Predicate. Return 1 if we're in automatic line wrapping mode. */
+/* Return truthvalue if current input file is different from the most recent
+ file involved in a diagnostic message. */
-static int
-doing_line_wrapping ()
+int
+error_module_changed ()
{
- return output_maximum_width > 0;
+ return last_error_tick != input_file_stack_tick;
}
-/* Set Maximum characters per line in automatic line wrapping mode. */
+/* Remember current file as being the most recent file involved in a
+ diagnostic message. */
void
-set_message_length (n)
- int n;
+record_last_error_module ()
{
- output_maximum_width = n;
+ last_error_tick = input_file_stack_tick;
}
-/* Construct an output BUFFER with PREFIX and of MAX_LENGTH characters
- per line. */
+/* Same as error_module_changed, but for function. */
-static void
-init_output_buffer (buffer, prefix, max_length)
- struct output_buffer *buffer;
- const char *prefix;
- int max_length;
+int
+error_function_changed ()
{
- obstack_init (&buffer->obstack);
- buffer->prefix = prefix;
- buffer->line_length = 0;
- buffer->max_length = max_length;
+ return last_error_function != current_function_decl;
}
-/* Return BUFFER's prefix. */
+/* Same as record_last_error_module, but for function. */
-static const char *
-get_output_prefix (buffer)
- const struct output_buffer *buffer;
+void
+record_last_error_function ()
{
- return buffer->prefix;
+ last_error_function = current_function_decl;
}
-/* Return the amount of characters BUFFER can accept to
- make a full line. */
+/* Initialize the diagnostic message outputting machinery. */
-static int
-output_space_left (buffer)
- const struct output_buffer *buffer;
+void
+initialize_diagnostics ()
{
- return buffer->max_length - buffer->line_length;
-}
+ /* By default, we don't line-wrap messages. */
+ diagnostic_message_length_per_line = 0;
+ set_message_prefixing_rule (DIAGNOSTICS_SHOW_PREFIX_ONCE);
-/* Dump BUFFER's prefix. */
+ /* Proceed to actual initialization. */
+ default_initialize_buffer (diagnostic_buffer);
-static void
-emit_output_prefix (buffer)
- struct output_buffer *buffer;
+ lang_diagnostic_starter = default_diagnostic_starter;
+ lang_diagnostic_finalizer = default_diagnostic_finalizer;
+}
+
+void
+set_message_prefixing_rule (rule)
+ int rule;
{
- if (buffer->prefix)
- {
- buffer->line_length = strlen (buffer->prefix);
- obstack_grow (&buffer->obstack, buffer->prefix, buffer->line_length);
- }
+ current_prefixing_rule = rule;
}
-/* Have BUFFER start a new line. */
+/* Returns true if BUFFER is in line-wrappind mode. */
-static void
-output_newline (buffer)
- struct output_buffer *buffer;
+int
+output_is_line_wrapping (buffer)
+ output_buffer *buffer;
{
- obstack_1grow (&buffer->obstack, '\n');
- buffer->line_length = 0;
+ return ideal_line_wrap_cutoff (buffer) > 0;
}
-/* Append a string deliminated by START and END to BUFFER. No wrapping is
- done. The caller must ensure that it is safe to do so. */
+/* Return BUFFER's prefix. */
-static void
-output_append (buffer, start, end)
- struct output_buffer *buffer;
- const char *start;
- const char *end;
+const char *
+output_get_prefix (buffer)
+ const output_buffer *buffer;
{
- int n;
-
- /* Emit prefix and skip whitespace if we're starting a new line. */
- if (buffer->line_length == 0)
- {
- emit_output_prefix (buffer);
- while (start != end && *start == ' ')
- ++start;
- }
- n = end - start;
- obstack_grow (&buffer->obstack, start, n);
- buffer->line_length += n;
+ return output_prefix (buffer);
}
-/* Wrap a STRing into BUFFER. */
+/* Subroutine of output_set_maximum_length. Set up BUFFER's
+ internal maximum characters per line. */
static void
-output_puts (buffer, str)
- struct output_buffer *buffer;
- const char *str;
+set_real_maximum_length (buffer)
+ output_buffer *buffer;
{
- const char *p = str;
-
- while (*str)
+ /* If we're told not to wrap lines then do the obvious thing. In case
+ we'll emit prefix only once per diagnostic message, it is appropriate
+ not to increase unncessarily the line-length cut-off. */
+ if (! output_is_line_wrapping (buffer)
+ || prefixing_policy (buffer) == DIAGNOSTICS_SHOW_PREFIX_ONCE
+ || prefixing_policy (buffer) == DIAGNOSTICS_SHOW_PREFIX_NEVER)
+ line_wrap_cutoff (buffer) = ideal_line_wrap_cutoff (buffer);
+ else
{
- while (*p && *p != ' ' && *p != '\n')
- ++p;
-
- if (p - str < output_space_left (buffer))
- output_append (buffer, str, p);
+ int prefix_length =
+ output_prefix (buffer) ? strlen (output_prefix (buffer)) : 0;
+ /* If the prefix is ridiculously too long, output at least
+ 32 characters. */
+ if (ideal_line_wrap_cutoff (buffer) - prefix_length < 32)
+ line_wrap_cutoff (buffer) = ideal_line_wrap_cutoff (buffer) + 32;
else
- {
- output_newline (buffer);
- output_append (buffer, str, p);
- }
-
- while (*p && *p == '\n')
- {
- output_newline (buffer);
- ++p;
- }
-
- str = p++;
+ line_wrap_cutoff (buffer) = ideal_line_wrap_cutoff (buffer);
}
}
-/* Dump the content of BUFFER into FILE. */
+/* Sets the number of maximum characters per line BUFFER can output
+ in line-wrapping mode. A LENGTH value 0 suppresses line-wrapping. */
-static void
-dump_output (buffer, file)
- struct output_buffer *buffer;
- FILE *file;
+void
+output_set_maximum_length (buffer, length)
+ output_buffer *buffer;
+ int length;
{
- const char *text;
-
- obstack_1grow (&buffer->obstack, '\0');
- text = obstack_finish (&buffer->obstack);
- fputs (text, file);
- obstack_free (&buffer->obstack, (char *)text);
- buffer->line_length = 0;
+ ideal_line_wrap_cutoff (buffer) = length;
+ set_real_maximum_length (buffer);
}
-static const char *
-vbuild_message_string (msgid, ap)
- const char *msgid;
- va_list ap;
+/* Sets BUFFER's PREFIX. */
+
+void
+output_set_prefix (buffer, prefix)
+ output_buffer *buffer;
+ const char *prefix;
{
- char *str;
+ output_prefix (buffer) = prefix;
+ set_real_maximum_length (buffer);
+ prefix_was_emitted_for (buffer) = 0;
+ output_indentation (buffer) = 0;
+}
- vasprintf (&str, msgid, ap);
- return str;
+/* Return a pointer to the last character emitted in the output
+ BUFFER area. A NULL pointer means no character available. */
+const char *
+output_last_position (buffer)
+ const output_buffer *buffer;
+{
+ const char *p = NULL;
+
+ if (obstack_base (&buffer->obstack) != obstack_next_free (&buffer->obstack))
+ p = ((const char *) obstack_next_free (&buffer->obstack)) - 1;
+ return p;
}
-/* Return a malloc'd string containing MSGID formatted a la
- printf. The caller is reponsible for freeing the memory. */
+/* Free BUFFER's prefix, a previously malloc'd string. */
-static const char *
-build_message_string VPARAMS ((const char *msgid, ...))
+void
+output_destroy_prefix (buffer)
+ output_buffer *buffer;
{
-#ifndef ANSI_PROTOTYPES
- const char *msgid;
-#endif
- va_list ap;
- const char *str;
+ if (output_prefix (buffer) != NULL)
+ {
+ free ((char *) output_prefix (buffer));
+ output_prefix (buffer) = NULL;
+ }
+}
- VA_START (ap, msgid);
+/* Zero out any text output so far in BUFFER. */
-#ifndef ANSI_PROTOTYPES
- msgid = va_arg (ap, const char *);
-#endif
-
- str = vbuild_message_string (msgid, ap);
+void
+output_clear_message_text (buffer)
+ output_buffer *buffer;
+{
+ obstack_free (&buffer->obstack, obstack_base (&buffer->obstack));
+ output_text_length (buffer) = 0;
+}
- va_end (ap);
+/* Zero out any diagnostic data used so far by BUFFER. */
- return str;
+static void
+clear_diagnostic_info (buffer)
+ output_buffer *buffer;
+{
+ output_buffer_text_cursor (buffer) = NULL;
+ output_buffer_ptr_to_format_args (buffer) = NULL;
+ prefix_was_emitted_for (buffer) = 0;
+ output_indentation (buffer) = 0;
}
+/* Construct an output BUFFER with PREFIX and of MAXIMUM_LENGTH
+ characters per line. */
-/* Return a malloc'd string describing a location. The caller is
- responsible for freeing the memory. */
+void
+init_output_buffer (buffer, prefix, maximum_length)
+ output_buffer *buffer;
+ const char *prefix;
+ int maximum_length;
+{
+ memset (buffer, 0, sizeof (output_buffer));
+ obstack_init (&buffer->obstack);
+ ideal_line_wrap_cutoff (buffer) = maximum_length;
+ prefixing_policy (buffer) = current_prefixing_rule;
+ output_set_prefix (buffer, prefix);
+ output_text_length (buffer) = 0;
+ clear_diagnostic_info (buffer);
+}
-static const char *
-build_location_prefix (file, line, warn)
- const char *file;
- int line;
- int warn;
+/* Initialize BUFFER with a NULL prefix and current diagnostic message
+ length cutoff. */
+
+void
+default_initialize_buffer (buffer)
+ output_buffer *buffer;
{
- const char *fmt = file
- ? (warn ? "%s:%d: warning: " : "%s:%d: ")
- : (warn ? "%s: warning: " : "%s: ");
+ init_output_buffer (buffer, NULL, diagnostic_message_length_per_line);
+}
+
+/* Recompute diagnostic_buffer's attributes to reflect any change
+ in diagnostic formatting global options. */
- return file
- ? build_message_string (fmt, file, line)
- : build_message_string (fmt, progname);
+void
+reshape_diagnostic_buffer ()
+{
+ ideal_line_wrap_cutoff (diagnostic_buffer) =
+ diagnostic_message_length_per_line;
+ prefixing_policy (diagnostic_buffer) = current_prefixing_rule;
+ set_real_maximum_length (diagnostic_buffer);
}
-/* Format a MESSAGE into BUFFER. Automatically wrap lines. */
+/* Reinitialize BUFFER. */
-static void
-voutput_notice (buffer, msgid, ap)
- struct output_buffer *buffer;
- const char *msgid;
- va_list ap;
+void
+output_clear (buffer)
+ output_buffer *buffer;
{
- const char *message = vbuild_message_string (msgid, ap);
+ output_clear_message_text (buffer);
+ clear_diagnostic_info (buffer);
+}
- output_puts (buffer, message);
- free ((char *)message);
+/* Finishes constructing a NULL-terminated character string representing
+ the BUFFERed message. */
+
+const char *
+output_finalize_message (buffer)
+ output_buffer *buffer;
+{
+ obstack_1grow (&buffer->obstack, '\0');
+ return output_message_text (buffer);
}
+void
+flush_diagnostic_buffer ()
+{
+ output_to_stream (diagnostic_buffer, stderr);
+ fflush (stderr);
+}
-/* Format a message into BUFFER a la printf. */
+/* Return the amount of characters BUFFER can accept to
+ make a full line. */
-static void
-output_printf VPARAMS ((struct output_buffer *buffer, const char *msgid, ...))
+int
+output_space_left (buffer)
+ const output_buffer *buffer;
{
-#ifndef ANSI_PROTOTYPES
- struct output_buffer *buffer;
- const char *msgid;
-#endif
- va_list ap;
+ return line_wrap_cutoff (buffer) - output_text_length (buffer);
+}
- VA_START (ap, msgid);
+/* Write out BUFFER's prefix. */
-#ifndef ANSI_PROTOTYPES
- buffer = va_arg (ap, struct output_buffer *);
- msgid = va_arg (ap, const char *);
-#endif
+void
+output_emit_prefix (buffer)
+ output_buffer *buffer;
+{
+ if (output_prefix (buffer) != NULL)
+ {
+ switch (prefixing_policy (buffer))
+ {
+ default:
+ case DIAGNOSTICS_SHOW_PREFIX_NEVER:
+ break;
- voutput_notice (buffer, msgid, ap);
- va_end (ap);
+ case DIAGNOSTICS_SHOW_PREFIX_ONCE:
+ if (prefix_was_emitted_for (buffer))
+ {
+ output_indent (buffer);
+ break;
+ }
+ output_indentation (buffer) += 3;
+ /* Fall through. */
+
+ case DIAGNOSTICS_SHOW_PREFIX_EVERY_LINE:
+ {
+ int prefix_length = strlen (output_prefix (buffer));
+ output_append_r (buffer, output_prefix (buffer), prefix_length);
+ prefix_was_emitted_for (buffer) = 1;
+ }
+ break;
+ }
+ }
}
+/* Have BUFFER start a new line. */
-/* Format a MESSAGE into FILE. Do line wrapping, starting new lines
- with PREFIX. */
-
-static void
-line_wrapper_printf VPARAMS ((FILE *file, const char *msgid, ...))
+void
+output_add_newline (buffer)
+ output_buffer *buffer;
{
-#ifndef ANSI_PROTOTYPES
- FILE *file;
- const char *msgid;
-#endif
- struct output_buffer buffer;
- va_list ap;
-
- VA_START (ap, msgid);
-
-#ifndef ANSI_PROTOTYPES
- file = va_arg (ap, FILE *);
- msgid = va_arg (ap, const char *);
-#endif
+ obstack_1grow (&buffer->obstack, '\n');
+ output_text_length (buffer) = 0;
+}
- init_output_buffer (&buffer, (const char *)NULL, output_maximum_width);
- voutput_notice (&buffer, msgid, ap);
- dump_output (&buffer, file);
+/* Appends a character to BUFFER. */
- va_end (ap);
+void
+output_add_character (buffer, c)
+ output_buffer *buffer;
+ int c;
+{
+ if (output_is_line_wrapping (buffer) && output_space_left (buffer) <= 0)
+ output_add_newline (buffer);
+ obstack_1grow (&buffer->obstack, c);
+ ++output_text_length (buffer);
}
+/* Adds a space to BUFFER. */
-static void
-vline_wrapper_message_with_location (file, line, warn, msgid, ap)
- const char *file;
- int line;
- int warn;
- const char *msgid;
- va_list ap;
+void
+output_add_space (buffer)
+ output_buffer *buffer;
{
- struct output_buffer buffer;
-
- init_output_buffer
- (&buffer, build_location_prefix (file, line, warn), output_maximum_width);
- voutput_notice (&buffer, msgid, ap);
- dump_output (&buffer, stderr);
- free ((char*)get_output_prefix (&buffer));
- fputc ('\n', stderr);
+ if (output_is_line_wrapping (buffer) && output_space_left (buffer) <= 0)
+ {
+ output_add_newline (buffer);
+ return;
+ }
+ obstack_1grow (&buffer->obstack, ' ');
+ ++output_text_length (buffer);
}
+/* These functions format an INTEGER into BUFFER as suggested by their
+ names. */
-/* Print the message MSGID in FILE. */
+void
+output_decimal (buffer, i)
+ output_buffer *buffer;
+ int i;
+{
+ output_formatted_integer (buffer, "%d", i);
+}
static void
-vnotice (file, msgid, ap)
- FILE *file;
- const char *msgid;
- va_list ap;
+output_long_decimal (buffer, i)
+ output_buffer *buffer;
+ long int i;
{
- vfprintf (file, _(msgid), ap);
+ output_formatted_integer (buffer, "%ld", i);
}
-/* Print MSGID on stderr. */
-
static void
-notice VPARAMS ((const char *msgid, ...))
+output_unsigned_decimal (buffer, i)
+ output_buffer *buffer;
+ unsigned int i;
{
-#ifndef ANSI_PROTOTYPES
- char *msgid;
-#endif
- va_list ap;
-
- VA_START (ap, msgid);
-
-#ifndef ANSI_PROTOTYPES
- msgid = va_arg (ap, char *);
-#endif
-
- vnotice (stderr, msgid, ap);
- va_end (ap);
+ output_formatted_integer (buffer, "%u", i);
}
-/* Report FILE and LINE (or program name), and optionally just WARN. */
+static void
+output_long_unsigned_decimal (buffer, i)
+ output_buffer *buffer;
+ long unsigned int i;
+{
+ output_formatted_integer (buffer, "%lu", i);
+}
static void
-report_file_and_line (file, line, warn)
- const char *file;
- int line;
- int warn;
+output_octal (buffer, i)
+ output_buffer *buffer;
+ unsigned int i;
{
- if (file)
- fprintf (stderr, "%s:%d: ", file, line);
- else
- fprintf (stderr, "%s: ", progname);
+ output_formatted_integer (buffer, "%o", i);
+}
- if (warn)
- notice ("warning: ");
+static void
+output_long_octal (buffer, i)
+ output_buffer *buffer;
+ unsigned long int i;
+{
+ output_formatted_integer (buffer, "%lo", i);
}
-/* Print a message relevant to line LINE of file FILE. */
+static void
+output_hexadecimal (buffer, i)
+ output_buffer *buffer;
+ unsigned int i;
+{
+ output_formatted_integer (buffer, "%x", i);
+}
static void
-v_message_with_file_and_line (file, line, warn, msgid, ap)
- const char *file;
- int line;
- int warn;
- const char *msgid;
- va_list ap;
+output_long_hexadecimal (buffer, i)
+ output_buffer *buffer;
+ unsigned long int i;
{
- report_file_and_line (file, line, warn);
- vnotice (stderr, msgid, ap);
- fputc ('\n', stderr);
+ output_formatted_integer (buffer, "%lx", i);
}
-/* Print a message relevant to the given DECL. */
+/* Append to BUFFER a string specified by its STARTING character
+ and LENGTH. */
static void
-v_message_with_decl (decl, warn, msgid, ap)
- tree decl;
- int warn;
- const char *msgid;
- va_list ap;
+output_append_r (buffer, start, length)
+ output_buffer *buffer;
+ const char *start;
+ int length;
{
- const char *p;
- struct output_buffer buffer;
-
- if (doing_line_wrapping ())
- init_output_buffer
- (&buffer,
- build_location_prefix (DECL_SOURCE_FILE (decl),
- DECL_SOURCE_LINE (decl), warn),
- output_maximum_width);
- else
- report_file_and_line (DECL_SOURCE_FILE (decl),
- DECL_SOURCE_LINE (decl), warn);
+ obstack_grow (&buffer->obstack, start, length);
+ output_text_length (buffer) += length;
+}
- /* Do magic to get around lack of varargs support for insertion
- of arguments into existing list. We know that the decl is first;
- we ass_u_me that it will be printed with "%s". */
+/* Append a string deliminated by START and END to BUFFER. No wrapping is
+ done. However, if beginning a new line then emit output_prefix (BUFFER)
+ and skip any leading whitespace if appropriate. The caller must ensure
+ that it is safe to do so. */
- for (p = _(msgid); *p; ++p)
+void
+output_append (buffer, start, end)
+ output_buffer *buffer;
+ const char *start;
+ const char *end;
+{
+ /* Emit prefix and skip whitespace if we're starting a new line. */
+ if (is_starting_newline (buffer))
{
- if (*p == '%')
- {
- if (*(p + 1) == '%')
- ++p;
- else if (*(p + 1) != 's')
- abort ();
- else
- break;
- }
+ output_emit_prefix (buffer);
+ if (output_is_line_wrapping (buffer))
+ while (start != end && *start == ' ')
+ ++start;
}
+ output_append_r (buffer, start, end - start);
+}
- if (p > _(msgid)) /* Print the left-hand substring. */
- {
- if (doing_line_wrapping ())
- output_printf (&buffer, "%.*s", (int)(p - _(msgid)), _(msgid));
- else
- fprintf (stderr, "%.*s", (int)(p - _(msgid)), _(msgid));
- }
+static void
+output_indent (buffer)
+ output_buffer *buffer;
+{
+ int n = output_indentation (buffer);
+ int i;
- if (*p == '%') /* Print the name. */
- {
- const char *n = (DECL_NAME (decl)
- ? (*decl_printable_name) (decl, 2)
- : "((anonymous))");
- if (doing_line_wrapping ())
- output_puts (&buffer, n);
- else
- fputs (n, stderr);
- while (*p)
- {
- ++p;
- if (ISALPHA (*(p - 1) & 0xFF))
- break;
- }
- }
+ for (i = 0; i < n; ++i)
+ output_add_character (buffer, ' ');
+}
- if (*p) /* Print the rest of the message. */
- {
- if (doing_line_wrapping ())
- voutput_notice (&buffer, p, ap);
- else
- vfprintf (stderr, p, ap);
- }
+/* Wrap a text delimited by START and END into BUFFER. */
- if (doing_line_wrapping())
+static void
+wrap_text (buffer, start, end)
+ output_buffer *buffer;
+ const char *start;
+ const char *end;
+{
+ int is_wrapping = output_is_line_wrapping (buffer);
+
+ while (start != end)
{
- dump_output (&buffer, stderr);
- free ((char *)get_output_prefix (&buffer));
+ /* Dump anything bodered by whitespaces. */
+ {
+ const char *p = start;
+ while (p != end && *p != ' ' && *p != '\n')
+ ++p;
+ if (is_wrapping && p - start >= output_space_left (buffer))
+ output_add_newline (buffer);
+ output_append (buffer, start, p);
+ start = p;
+ }
+
+ if (start != end && *start == ' ')
+ {
+ output_add_space (buffer);
+ ++start;
+ }
+ if (start != end && *start == '\n')
+ {
+ output_add_newline (buffer);
+ ++start;
+ }
}
-
- fputc ('\n', stderr);
}
-/* Figure file and line of the given INSN. */
+/* Same as wrap_text but wrap text only when in line-wrapping mode. */
static void
-file_and_line_for_asm (insn, pfile, pline)
- rtx insn;
- char **pfile;
- int *pline;
+maybe_wrap_text (buffer, start, end)
+ output_buffer *buffer;
+ const char *start;
+ const char *end;
{
- rtx body = PATTERN (insn);
- rtx asmop;
-
- /* Find the (or one of the) ASM_OPERANDS in the insn. */
- if (GET_CODE (body) == SET && GET_CODE (SET_SRC (body)) == ASM_OPERANDS)
- asmop = SET_SRC (body);
- else if (GET_CODE (body) == ASM_OPERANDS)
- asmop = body;
- else if (GET_CODE (body) == PARALLEL
- && GET_CODE (XVECEXP (body, 0, 0)) == SET)
- asmop = SET_SRC (XVECEXP (body, 0, 0));
- else if (GET_CODE (body) == PARALLEL
- && GET_CODE (XVECEXP (body, 0, 0)) == ASM_OPERANDS)
- asmop = XVECEXP (body, 0, 0);
+ if (output_is_line_wrapping (buffer))
+ wrap_text (buffer, start, end);
else
- asmop = NULL;
-
- if (asmop)
- {
- *pfile = ASM_OPERANDS_SOURCE_FILE (asmop);
- *pline = ASM_OPERANDS_SOURCE_LINE (asmop);
- }
- else
- {
- *pfile = input_filename;
- *pline = lineno;
- }
+ output_append (buffer, start, end);
}
-/* Report an error at line LINE of file FILE. */
-static void
-v_error_with_file_and_line (file, line, msgid, ap)
- const char *file;
- int line;
- const char *msgid;
- va_list ap;
+/* Append a STRING to BUFFER; the STRING might be line-wrapped if in
+ appropriate mode. */
+
+void
+output_add_string (buffer, str)
+ output_buffer *buffer;
+ const char *str;
{
- count_error (0);
- report_error_function (file);
- if (doing_line_wrapping ())
- vline_wrapper_message_with_location (file, line, 0, msgid, ap);
- else
- v_message_with_file_and_line (file, line, 0, msgid, ap);
+ maybe_wrap_text (buffer, str, str + (str ? strlen (str) : 0));
}
-/* Report an error at the declaration DECL.
- MSGID is a format string which uses %s to substitute the declaration
- name; subsequent substitutions are a la printf. */
+/* Flush the content of BUFFER onto FILE and reinitialize BUFFER. */
static void
-v_error_with_decl (decl, msgid, ap)
- tree decl;
- const char *msgid;
- va_list ap;
+output_to_stream (buffer, file)
+ output_buffer *buffer;
+ FILE *file;
{
- count_error (0);
- report_error_function (DECL_SOURCE_FILE (decl));
- v_message_with_decl (decl, 0, msgid, ap);
+ const char *text = output_finalize_message (buffer);
+ fputs (text, file);
+ output_clear_message_text (buffer);
}
-
-/* Report an error at the line number of the insn INSN.
- This is used only when INSN is an `asm' with operands,
- and each ASM_OPERANDS records its own source file and line. */
+/* Format a message pointed to by output_buffer_text_cursor (BUFFER) using
+ output_buffer_format_args (BUFFER) as appropriate. The following format
+ specifiers are recognized as being language independent:
+ %d, %i: (signed) integer in base ten.
+ %u: unsigned integer in base ten.
+ %o: unsigned integer in base eight.
+ %x: unsigned integer in base sixteen.
+ %ld, %li, %lo, %lu, %lx: long versions of the above.
+ %c: character.
+ %s: string.
+ %%: `%'.
+ %*.s: a substring the length of which is specified by an integer. */
static void
-v_error_for_asm (insn, msgid, ap)
- rtx insn;
- const char *msgid;
- va_list ap;
+output_format (buffer)
+ output_buffer *buffer;
{
- char *file;
- int line;
+ for (; *output_buffer_text_cursor (buffer);
+ ++output_buffer_text_cursor (buffer))
+ {
+ int long_integer = 0;
- count_error (0);
- file_and_line_for_asm (insn, &file, &line);
- report_error_function (file);
- v_message_with_file_and_line (file, line, 0, msgid, ap);
-}
+ /* Ignore text. */
+ {
+ const char *p = output_buffer_text_cursor (buffer);
+ while (*p && *p != '%')
+ ++p;
+ wrap_text (buffer, output_buffer_text_cursor (buffer), p);
+ output_buffer_text_cursor (buffer) = p;
+ }
+ if (!*output_buffer_text_cursor (buffer))
+ break;
-/* Report an error at the current line number. */
+ /* We got a '%'. Let's see what happens. Record whether we're
+ parsing a long integer format specifier. */
+ if (*++output_buffer_text_cursor (buffer) == 'l')
+ {
+ long_integer = 1;
+ ++output_buffer_text_cursor (buffer);
+ }
-static void
-verror (msgid, ap)
+ /* Handle %c, %d, %i, %ld, %li, %lo, %lu, %lx, %o, %s, %u,
+ %x, %.*s; %%. And nothing else. Front-ends should install
+ printers to grok language specific format specifiers. */
+ switch (*output_buffer_text_cursor (buffer))
+ {
+ case 'c':
+ output_add_character
+ (buffer, va_arg (output_buffer_format_args (buffer), int));
+ break;
+
+ case 'd':
+ case 'i':
+ if (long_integer)
+ output_long_decimal
+ (buffer, va_arg (output_buffer_format_args (buffer), long int));
+ else
+ output_decimal
+ (buffer, va_arg (output_buffer_format_args (buffer), int));
+ break;
+
+ case 'o':
+ if (long_integer)
+ output_long_octal (buffer,
+ va_arg (output_buffer_format_args (buffer),
+ unsigned long int));
+ else
+ output_octal (buffer,
+ va_arg (output_buffer_format_args (buffer),
+ unsigned int));
+ break;
+
+ case 's':
+ output_add_string (buffer,
+ va_arg (output_buffer_format_args (buffer),
+ const char *));
+ break;
+
+ case 'u':
+ if (long_integer)
+ output_long_unsigned_decimal
+ (buffer, va_arg (output_buffer_format_args (buffer),
+ long unsigned int));
+ else
+ output_unsigned_decimal
+ (buffer, va_arg (output_buffer_format_args (buffer),
+ unsigned int));
+ break;
+
+ case 'x':
+ if (long_integer)
+ output_long_hexadecimal
+ (buffer, va_arg (output_buffer_format_args (buffer),
+ unsigned long int));
+ else
+ output_hexadecimal
+ (buffer, va_arg (output_buffer_format_args (buffer),
+ unsigned int));
+ break;
+
+ case '%':
+ output_add_character (buffer, '%');
+ break;
+
+ case '.':
+ {
+ int n;
+ const char *s;
+ /* We handle no precision specifier but `%.*s'. */
+ if (*++output_buffer_text_cursor (buffer) != '*')
+ abort ();
+ else if (*++output_buffer_text_cursor (buffer) != 's')
+ abort();
+ n = va_arg (output_buffer_format_args (buffer), int);
+ s = va_arg (output_buffer_format_args (buffer), const char *);
+ output_append (buffer, s, s + n);
+ }
+ break;
+
+ default:
+ if (! lang_printer || !(*lang_printer) (buffer))
+ {
+ /* Hmmm. The front-end failed to install a format translator
+ but called us with an unrecognized format. Sorry. */
+ abort ();
+ }
+ }
+ }
+}
+
+static char *
+vbuild_message_string (msgid, ap)
const char *msgid;
va_list ap;
{
- v_error_with_file_and_line (input_filename, lineno, msgid, ap);
+ char *str;
+
+ vasprintf (&str, msgid, ap);
+ return str;
}
+/* Return a malloc'd string containing MSGID formatted a la
+ printf. The caller is reponsible for freeing the memory. */
-/* Report a fatal error at the current line number. Allow a front end to
- intercept the message. */
+static char *
+build_message_string VPARAMS ((const char *msgid, ...))
+{
+#ifndef ANSI_PROTOTYPES
+ const char *msgid;
+#endif
+ va_list ap;
+ char *str;
+
+ VA_START (ap, msgid);
-static void (*fatal_function) PARAMS ((const char *, va_list));
+#ifndef ANSI_PROTOTYPES
+ msgid = va_arg (ap, const char *);
+#endif
-static void
-vfatal (msgid, ap)
- const char *msgid;
- va_list ap;
-{
- if (fatal_function != 0)
- (*fatal_function) (_(msgid), ap);
+ str = vbuild_message_string (msgid, ap);
- verror (msgid, ap);
- exit (FATAL_EXIT_CODE);
+ va_end (ap);
+
+ return str;
}
-/* Report a warning at line LINE of file FILE. */
+/* Return a malloc'd string describing a location. The caller is
+ responsible for freeing the memory. */
-static void
-v_warning_with_file_and_line (file, line, msgid, ap)
+char *
+context_as_prefix (file, line, warn)
const char *file;
int line;
- const char *msgid;
- va_list ap;
+ int warn;
{
- if (count_error (1))
+ if (file)
{
- report_error_function (file);
- if (doing_line_wrapping ())
- vline_wrapper_message_with_location (file, line, 1, msgid, ap);
+ if (warn)
+ return build_message_string ("%s:%d: warning: ", file, line);
else
- v_message_with_file_and_line (file, line, 1, msgid, ap);
+ return build_message_string ("%s:%d: ", file, line);
+ }
+ else
+ {
+ if (warn)
+ return build_message_string ("%s: warning: ", progname);
+ else
+ return build_message_string ("%s: ", progname);
}
}
+/* Same as context_as_prefix, but only the source FILE is given. */
-/* Report a warning at the declaration DECL.
- MSGID is a format string which uses %s to substitute the declaration
- name; subsequent substitutions are a la printf. */
+char *
+file_name_as_prefix (f)
+ const char *f;
+{
+ return build_message_string ("%s: ", f);
+}
+
+/* Format a MESSAGE into BUFFER. Automatically wrap lines. */
static void
-v_warning_with_decl (decl, msgid, ap)
- tree decl;
+output_do_printf (buffer, msgid)
+ output_buffer *buffer;
const char *msgid;
- va_list ap;
{
- if (count_error (1))
- {
- report_error_function (DECL_SOURCE_FILE (decl));
- v_message_with_decl (decl, 1, msgid, ap);
- }
+ char *message = vbuild_message_string (msgid,
+ output_buffer_format_args (buffer));
+
+ wrap_text (buffer, message, message + strlen (message));
+ free (message);
}
-/* Report a warning at the line number of the insn INSN.
- This is used only when INSN is an `asm' with operands,
- and each ASM_OPERANDS records its own source file and line. */
+/* Format a message into BUFFER a la printf. */
-static void
-v_warning_for_asm (insn, msgid, ap)
- rtx insn;
- const char *msgid;
- va_list ap;
+void
+output_printf VPARAMS ((struct output_buffer *buffer, const char *msgid, ...))
{
- if (count_error (1))
- {
- char *file;
- int line;
+#ifndef ANSI_PROTOTYPES
+ struct output_buffer *buffer;
+ const char *msgid;
+#endif
+ va_list ap;
+ va_list *old_args;
- file_and_line_for_asm (insn, &file, &line);
- report_error_function (file);
- v_message_with_file_and_line (file, line, 1, msgid, ap);
- }
+ VA_START (ap, msgid);
+#ifndef ANSI_PROTOTYPES
+ buffer = va_arg (ap, output_buffer *);
+ msgid = va_arg (ap, const char *);
+#endif
+ old_args = output_buffer_ptr_to_format_args (buffer);
+ output_buffer_ptr_to_format_args (buffer) = ≈
+ output_do_printf (buffer, msgid);
+ output_buffer_ptr_to_format_args (buffer) = old_args;
+ va_end (ap);
}
-
-/* Report a warning at the current line number. */
+/* Print the message MSGID in FILE. */
static void
-vwarning (msgid, ap)
+vnotice (file, msgid, ap)
+ FILE *file;
const char *msgid;
va_list ap;
{
- v_warning_with_file_and_line (input_filename, lineno, msgid, ap);
+ vfprintf (file, _(msgid), ap);
}
-/* These functions issue either warnings or errors depending on
- -pedantic-errors. */
+/* Print a message relevant to the given DECL. */
static void
-vpedwarn (msgid, ap)
- const char *msgid;
- va_list ap;
+format_with_decl (buffer, decl)
+ output_buffer *buffer;
+ tree decl;
{
- if (flag_pedantic_errors)
- verror (msgid, ap);
- else
- vwarning (msgid, ap);
+ const char *p;
+
+ /* Do magic to get around lack of varargs support for insertion
+ of arguments into existing list. We know that the decl is first;
+ we ass_u_me that it will be printed with "%s". */
+ for (p = output_buffer_text_cursor (buffer); *p; ++p)
+ {
+ if (*p == '%')
+ {
+ if (*(p + 1) == '%')
+ ++p;
+ else if (*(p + 1) != 's')
+ abort ();
+ else
+ break;
+ }
+ }
+
+ /* Print the left-hand substring. */
+ maybe_wrap_text (buffer, output_buffer_text_cursor (buffer), p);
+
+ if (*p == '%') /* Print the name. */
+ {
+ const char *n = (DECL_NAME (decl)
+ ? (*decl_printable_name) (decl, 2)
+ : _("((anonymous))"));
+ output_add_string (buffer, n);
+ while (*p)
+ {
+ ++p;
+ if (ISALPHA (*(p - 1) & 0xFF))
+ break;
+ }
+ }
+
+ if (*p) /* Print the rest of the message. */
+ {
+ output_buffer_text_cursor (buffer) = p;
+ output_format (buffer);
+ }
}
+/* Figure file and line of the given INSN. */
static void
-v_pedwarn_with_decl (decl, msgid, ap)
- tree decl;
- const char *msgid;
- va_list ap;
+file_and_line_for_asm (insn, pfile, pline)
+ rtx insn;
+ const char **pfile;
+ int *pline;
{
- /* We don't want -pedantic-errors to cause the compilation to fail from
- "errors" in system header files. Sometimes fixincludes can't fix what's
- broken (eg: unsigned char bitfields - fixing it may change the alignment
- which will cause programs to mysteriously fail because the C library
- or kernel uses the original layout). There's no point in issuing a
- warning either, it's just unnecessary noise. */
+ rtx body = PATTERN (insn);
+ rtx asmop;
+
+ /* Find the (or one of the) ASM_OPERANDS in the insn. */
+ if (GET_CODE (body) == SET && GET_CODE (SET_SRC (body)) == ASM_OPERANDS)
+ asmop = SET_SRC (body);
+ else if (GET_CODE (body) == ASM_OPERANDS)
+ asmop = body;
+ else if (GET_CODE (body) == PARALLEL
+ && GET_CODE (XVECEXP (body, 0, 0)) == SET)
+ asmop = SET_SRC (XVECEXP (body, 0, 0));
+ else if (GET_CODE (body) == PARALLEL
+ && GET_CODE (XVECEXP (body, 0, 0)) == ASM_OPERANDS)
+ asmop = XVECEXP (body, 0, 0);
+ else
+ asmop = NULL;
- if (! DECL_IN_SYSTEM_HEADER (decl))
+ if (asmop)
{
- if (flag_pedantic_errors)
- v_error_with_decl (decl, msgid, ap);
- else
- v_warning_with_decl (decl, msgid, ap);
+ *pfile = ASM_OPERANDS_SOURCE_FILE (asmop);
+ *pline = ASM_OPERANDS_SOURCE_LINE (asmop);
+ }
+ else
+ {
+ *pfile = input_filename;
+ *pline = lineno;
}
}
+/* Report a diagnostic MESSAGE (an errror or a WARNING) at the line number
+ of the insn INSN. This is used only when INSN is an `asm' with operands,
+ and each ASM_OPERANDS records its own source file and line. */
static void
-v_pedwarn_with_file_and_line (file, line, msgid, ap)
- const char *file;
- int line;
- const char *msgid;
- va_list ap;
+diagnostic_for_asm (insn, msg, args_ptr, warn)
+ rtx insn;
+ const char *msg;
+ va_list *args_ptr;
+ int warn;
{
- if (flag_pedantic_errors)
- v_error_with_file_and_line (file, line, msgid, ap);
- else
- v_warning_with_file_and_line (file, line, msgid, ap);
-}
+ diagnostic_context dc;
+ set_diagnostic_context (&dc, msg, args_ptr, NULL, 0, warn);
+ file_and_line_for_asm (insn, &diagnostic_file_location (&dc),
+ &diagnostic_line_location (&dc));
+ report_diagnostic (&dc);
+}
-/* Apologize for not implementing some feature. */
+/* Report a diagnostic MESSAGE at the declaration DECL.
+ MSG is a format string which uses %s to substitute the declaration
+ name; subsequent substitutions are a la output_format. */
static void
-vsorry (msgid, ap)
- const char *msgid;
- va_list ap;
+diagnostic_for_decl (decl, msg, args_ptr, warn)
+ tree decl;
+ const char *msg;
+ va_list *args_ptr;
+ int warn;
{
- sorrycount++;
- if (input_filename)
- fprintf (stderr, "%s:%d: ", input_filename, lineno);
- else
- fprintf (stderr, "%s: ", progname);
- notice ("sorry, not implemented: ");
- vnotice (stderr, msgid, ap);
- fputc ('\n', stderr);
+ output_state os;
+
+ if (diagnostic_lock++)
+ error_recursion ();
+
+ if (count_error (warn))
+ {
+ os = output_buffer_state (diagnostic_buffer);
+ report_error_function (DECL_SOURCE_FILE (decl));
+ output_set_prefix
+ (diagnostic_buffer, context_as_prefix
+ (DECL_SOURCE_FILE (decl), DECL_SOURCE_LINE (decl), warn));
+ output_buffer_ptr_to_format_args (diagnostic_buffer) = args_ptr;
+ output_buffer_text_cursor (diagnostic_buffer) = msg;
+ format_with_decl (diagnostic_buffer, decl);
+ finish_diagnostic ();
+ output_destroy_prefix (diagnostic_buffer);
+
+ output_buffer_state (diagnostic_buffer) = os;
+ }
+ diagnostic_lock--;
}
\f
count_error (warningp)
int warningp;
{
- if (warningp && inhibit_warnings)
+ if (warningp
+ && (inhibit_warnings
+ || (in_system_header && !warn_system_headers)))
return 0;
if (warningp && !warnings_are_errors)
if (warningp && !warning_message)
{
- notice ("%s: warnings being treated as errors\n", progname);
+ verbatim ("%s: warnings being treated as errors\n", progname);
warning_message = 1;
}
errorcount++;
}
/* Print a diagnistic MSGID on FILE. */
+
void
fnotice VPARAMS ((FILE *file, const char *msgid, ...))
{
fatal_io_error (name)
const char *name;
{
- notice ("%s: %s: I/O error\n", progname, name);
+ verbatim ("%s: %s: I/O error\n", progname, name);
exit (FATAL_EXIT_CODE);
}
/* Issue a pedantic warning MSGID. */
+
void
pedwarn VPARAMS ((const char *msgid, ...))
{
const char *msgid;
#endif
va_list ap;
+ diagnostic_context dc;
VA_START (ap, msgid);
msgid = va_arg (ap, const char *);
#endif
- vpedwarn (msgid, ap);
+ set_diagnostic_context
+ (&dc, msgid, &ap, input_filename, lineno, !flag_pedantic_errors);
+ report_diagnostic (&dc);
va_end (ap);
}
/* Issue a pedantic waring about DECL. */
+
void
pedwarn_with_decl VPARAMS ((tree decl, const char *msgid, ...))
{
decl = va_arg (ap, tree);
msgid = va_arg (ap, const char *);
#endif
-
- v_pedwarn_with_decl (decl, msgid, ap);
+ /* We don't want -pedantic-errors to cause the compilation to fail from
+ "errors" in system header files. Sometimes fixincludes can't fix what's
+ broken (eg: unsigned char bitfields - fixing it may change the alignment
+ which will cause programs to mysteriously fail because the C library
+ or kernel uses the original layout). There's no point in issuing a
+ warning either, it's just unnecessary noise. */
+ if (!DECL_IN_SYSTEM_HEADER (decl))
+ diagnostic_for_decl (decl, msgid, &ap, !flag_pedantic_errors);
va_end (ap);
}
/* Same as above but within the context FILE and LINE. */
+
void
pedwarn_with_file_and_line VPARAMS ((const char *file, int line,
const char *msgid, ...))
const char *msgid;
#endif
va_list ap;
+ diagnostic_context dc;
VA_START (ap, msgid);
msgid = va_arg (ap, const char *);
#endif
- v_pedwarn_with_file_and_line (file, line, msgid, ap);
+ set_diagnostic_context (&dc, msgid, &ap, file, line, !flag_pedantic_errors);
+ report_diagnostic (&dc);
va_end (ap);
}
/* Just apologize with MSGID. */
+
void
sorry VPARAMS ((const char *msgid, ...))
{
const char *msgid;
#endif
va_list ap;
+ output_state os;
+ os = output_buffer_state (diagnostic_buffer);
VA_START (ap, msgid);
#ifndef ANSI_PROTOTYPES
msgid = va_arg (ap, const char *);
#endif
-
- vsorry (msgid, ap);
+ ++sorrycount;
+ output_set_prefix
+ (diagnostic_buffer, context_as_prefix (input_filename, lineno, 0));
+ output_printf (diagnostic_buffer, "sorry, not implemented: ");
+ output_buffer_ptr_to_format_args (diagnostic_buffer) = ≈
+ output_buffer_text_cursor (diagnostic_buffer) = msgid;
+ output_format (diagnostic_buffer);
+ finish_diagnostic ();
+ output_buffer_state (diagnostic_buffer) = os;
va_end (ap);
}
if (! quiet_flag)
{
if (rtl_dump_and_exit)
- fprintf (stderr, "%s ", IDENTIFIER_POINTER (DECL_NAME (decl)));
+ verbatim ("%s ", IDENTIFIER_POINTER (DECL_NAME (decl)));
else
- {
- if (doing_line_wrapping ())
- line_wrapper_printf
- (stderr, " %s", (*decl_printable_name) (decl, 2));
- else
- fprintf (stderr, " %s", (*decl_printable_name) (decl, 2));
- }
+ verbatim (" %s", (*decl_printable_name) (decl, 2));
fflush (stderr);
- need_error_newline = 1;
- last_error_function = current_function_decl;
+ output_needs_newline (diagnostic_buffer) = 1;
+ record_last_error_function ();
}
}
default_print_error_function (file)
const char *file;
{
- if (last_error_function != current_function_decl)
+ if (error_function_changed ())
{
- const char *prefix = NULL;
- struct output_buffer buffer;
-
- if (file)
- prefix = build_message_string ("%s: ", file);
+ char *prefix = file ? build_message_string ("%s: ", file) : NULL;
+ output_state os;
- if (doing_line_wrapping ())
- init_output_buffer (&buffer, prefix, output_maximum_width);
- else
- {
- if (file)
- fprintf (stderr, "%s: ", file);
- }
+ os = output_buffer_state (diagnostic_buffer);
+ output_set_prefix (diagnostic_buffer, prefix);
if (current_function_decl == NULL)
- {
- if (doing_line_wrapping ())
- output_printf (&buffer, "At top level:\n");
- else
- notice ("At top level:\n");
- }
+ output_add_string (diagnostic_buffer, "At top level:");
else
{
if (TREE_CODE (TREE_TYPE (current_function_decl)) == METHOD_TYPE)
- {
- if (doing_line_wrapping ())
- output_printf
- (&buffer, "In method `%s':\n",
- (*decl_printable_name) (current_function_decl, 2));
- else
- notice ("In method `%s':\n",
- (*decl_printable_name) (current_function_decl, 2));
- }
+ output_printf
+ (diagnostic_buffer, "In method `%s':",
+ (*decl_printable_name) (current_function_decl, 2));
else
- {
- if (doing_line_wrapping ())
- output_printf
- (&buffer, "In function `%s':\n",
- (*decl_printable_name) (current_function_decl, 2));
- else
- notice ("In function `%s':\n",
- (*decl_printable_name) (current_function_decl, 2));
- }
+ output_printf
+ (diagnostic_buffer, "In function `%s':",
+ (*decl_printable_name) (current_function_decl, 2));
}
+ output_add_newline (diagnostic_buffer);
- last_error_function = current_function_decl;
-
- if (doing_line_wrapping ())
- dump_output (&buffer, stderr);
-
- free ((char *)prefix);
+ record_last_error_function ();
+ output_to_stream (diagnostic_buffer, stderr);
+ output_buffer_state (diagnostic_buffer) = os;
+ free ((char*) prefix);
}
}
report_error_function (file)
const char *file ATTRIBUTE_UNUSED;
{
- struct file_stack *p;
-
- if (need_error_newline)
- {
- fprintf (stderr, "\n");
- need_error_newline = 0;
- }
-
- if (input_file_stack && input_file_stack->next != 0
- && input_file_stack_tick != last_error_tick)
- {
- for (p = input_file_stack->next; p; p = p->next)
- if (p == input_file_stack->next)
- notice ("In file included from %s:%d", p->name, p->line);
- else
- notice (",\n from %s:%d", p->name, p->line);
- fprintf (stderr, ":\n");
- last_error_tick = input_file_stack_tick;
- }
-
+ report_problematic_module (diagnostic_buffer);
(*print_error_function) (input_filename);
}
const char *msgid;
#endif
va_list ap;
+ diagnostic_context dc;
VA_START (ap, msgid);
msgid = va_arg (ap, const char *);
#endif
- v_error_with_file_and_line (file, line, msgid, ap);
+ set_diagnostic_context (&dc, msgid, &ap, file, line, /* warn = */ 0);
+ report_diagnostic (&dc);
va_end (ap);
}
msgid = va_arg (ap, const char *);
#endif
- v_error_with_decl (decl, msgid, ap);
+ diagnostic_for_decl (decl, msgid, &ap, /* warn = */ 0);
va_end (ap);
}
msgid = va_arg (ap, const char *);
#endif
- v_error_for_asm (insn, msgid, ap);
+ diagnostic_for_asm (insn, msgid, &ap, /* warn = */ 0);
va_end (ap);
}
const char *msgid;
#endif
va_list ap;
+ diagnostic_context dc;
VA_START (ap, msgid);
msgid = va_arg (ap, const char *);
#endif
- verror (msgid, ap);
+ set_diagnostic_context
+ (&dc, msgid, &ap, input_filename, lineno, /* warn = */ 0);
+ report_diagnostic (&dc);
va_end (ap);
}
+/* Report a fatal error at the current line number. Allow a front end to
+ intercept the message. */
+
+static void (*fatal_function) PARAMS((const char *, va_list *));
+
/* Set the function to call when a fatal error occurs. */
void
set_fatal_function (f)
- void (*f) PARAMS ((const char *, va_list));
+ void (*f) PARAMS ((const char *, va_list *));
{
fatal_function = f;
}
const char *msgid;
#endif
va_list ap;
+ diagnostic_context dc;
VA_START (ap, msgid);
msgid = va_arg (ap, const char *);
#endif
- vfatal (msgid, ap);
+ if (errorcount > 1 || sorrycount > 0)
+ {
+ fprintf (stderr, "confused by earlier errors, bailing out\n");
+ exit (FATAL_EXIT_CODE);
+ }
+
+ if (fatal_function != 0)
+ (*fatal_function) (_(msgid), &ap);
+
+ set_diagnostic_context
+ (&dc, msgid, &ap, input_filename, lineno, /* warn = */0);
+ report_diagnostic (&dc);
va_end (ap);
+
+ fprintf
+ (stderr, "Please submit a full bug report.\n See %s for instructions.\n",
+ GCCBUGURL);
+ exit (FATAL_EXIT_CODE);
}
void
const char *msgid;
#endif
va_list ap;
+ diagnostic_context dc;
VA_START (ap, msgid);
msgid = va_arg (ap, const char *);
#endif
- v_warning_with_file_and_line (file, line, msgid, ap);
+ set_diagnostic_context (&dc, msgid, &ap, file, line, /* warn = */ 1);
+ report_diagnostic (&dc);
va_end (ap);
}
msgid = va_arg (ap, const char *);
#endif
- v_warning_with_decl (decl, msgid, ap);
+ diagnostic_for_decl (decl, msgid, &ap, /* warn = */ 1);
va_end (ap);
}
msgid = va_arg (ap, const char *);
#endif
- v_warning_for_asm (insn, msgid, ap);
+ diagnostic_for_asm (insn, msgid, &ap, /* warn = */ 1);
va_end (ap);
}
const char *msgid;
#endif
va_list ap;
+ diagnostic_context dc;
VA_START (ap, msgid);
msgid = va_arg (ap, const char *);
#endif
- vwarning (msgid, ap);
+ set_diagnostic_context
+ (&dc, msgid, &ap, input_filename, lineno, /* warn = */ 1);
+ report_diagnostic (&dc);
+ va_end (ap);
+}
+
+/* Flush diagnostic_buffer content on stderr. */
+
+static void
+finish_diagnostic ()
+{
+ output_to_stream (diagnostic_buffer, stderr);
+ clear_diagnostic_info (diagnostic_buffer);
+ fputc ('\n', stderr);
+ fflush (stderr);
+}
+
+/* Helper subroutine of output_verbatim and verbatim. Do the approriate
+ settings needed by BUFFER for a verbatim formatting. */
+
+static void
+output_do_verbatim (buffer, msg, args_ptr)
+ output_buffer *buffer;
+ const char *msg;
+ va_list *args_ptr;
+{
+ output_state os;
+
+ os = output_buffer_state (buffer);
+ output_prefix (buffer) = NULL;
+ prefixing_policy (buffer) = DIAGNOSTICS_SHOW_PREFIX_NEVER;
+ output_buffer_text_cursor (buffer) = msg;
+ output_buffer_ptr_to_format_args (buffer) = args_ptr;
+ output_set_maximum_length (buffer, 0);
+ output_format (buffer);
+ output_buffer_state (buffer) = os;
+}
+
+/* Output MESSAGE verbatim into BUFFER. */
+
+void
+output_verbatim VPARAMS ((output_buffer *buffer, const char *msg, ...))
+{
+#ifndef ANSI_PROTOTYPES
+ output_buffer *buffer;
+ const char *msg;
+#endif
+ va_list ap;
+
+ VA_START (ap, msg);
+#ifndef ANSI_PROTOTYPES
+ buffer = va_arg (ap, output_buffer *);
+ msg = va_arg (ap, const char *);
+#endif
+ output_do_verbatim (buffer, msg, &ap);
+ va_end (ap);
+}
+
+/* Same as above but use diagnostic_buffer. */
+
+void
+verbatim VPARAMS ((const char *msg, ...))
+{
+#ifndef ANSI_PROTOTYPES
+ const char *msg;
+#endif
+ va_list ap;
+
+ VA_START (ap, msg);
+#ifndef ANSI_PROTOTYPES
+ msg = va_arg (ap, const char *);
+#endif
+ output_do_verbatim (diagnostic_buffer, msg, &ap);
+ output_to_stream (diagnostic_buffer, stderr);
va_end (ap);
}
+/* Report a diagnostic message (an error or a warning) as specified by
+ 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. */
+
+void
+report_diagnostic (dc)
+ diagnostic_context *dc;
+{
+ output_state os;
+
+ if (diagnostic_lock++)
+ error_recursion ();
+
+ if (count_error (diagnostic_is_warning (dc)))
+ {
+ os = output_buffer_state (diagnostic_buffer);
+ diagnostic_msg = diagnostic_message (dc);
+ diagnostic_args = diagnostic_argument_list (dc);
+ (*diagnostic_starter (dc)) (diagnostic_buffer, dc);
+ output_format (diagnostic_buffer);
+ (*diagnostic_finalizer (dc)) (diagnostic_buffer, dc);
+ finish_diagnostic ();
+ output_buffer_state (diagnostic_buffer) = os;
+ }
+
+ diagnostic_lock--;
+}
+
+/* Inform the user that an error occurred while trying to report some
+ other error. This indicates catastrophic internal inconsistencies,
+ so give up now. But do try to flush out the previous error. */
+
+static void
+error_recursion ()
+{
+ if (diagnostic_lock < 3)
+ finish_diagnostic ();
+
+ fatal ("Internal compiler error: Error reporting routines re-entered.");
+}
+
+/* Given a partial pathname as input, return another pathname that
+ shares no directory elements with the pathname of __FILE__. This
+ is used by fancy_abort() to print `Internal compiler error in expr.c'
+ instead of `Internal compiler error in ../../GCC/gcc/expr.c'. */
+
+static const char *
+trim_filename (name)
+ const char *name;
+{
+ static const char this_file[] = __FILE__;
+ const char *p = name, *q = this_file;
+
+ /* First skip any "../" in each filename. This allows us to give a proper
+ reference to a file in a subdirectory. */
+ while (p[0] == '.' && p[1] == '.'
+ && (p[2] == DIR_SEPARATOR
+#ifdef DIR_SEPARATOR_2
+ || p[2] == DIR_SEPARATOR_2
+#endif
+ ))
+ p += 3;
+
+ while (q[0] == '.' && q[1] == '.'
+ && (q[2] == DIR_SEPARATOR
+#ifdef DIR_SEPARATOR_2
+ || p[2] == DIR_SEPARATOR_2
+#endif
+ ))
+ q += 3;
+
+ /* Now skip any parts the two filenames have in common. */
+ while (*p == *q && *p != 0 && *q != 0)
+ p++, q++;
+
+ /* Now go backwards until the previous directory separator. */
+ while (p > name && p[-1] != DIR_SEPARATOR
+#ifdef DIR_SEPARATOR_2
+ && p[-1] != DIR_SEPARATOR_2
+#endif
+ )
+ p--;
+
+ return p;
+}
+
+/* Report an internal compiler error in a friendly manner and without
+ dumping core. */
+
+void
+fancy_abort (file, line, function)
+ const char *file;
+ int line;
+ const char *function;
+{
+ fatal ("Internal compiler error in %s, at %s:%d",
+ function, trim_filename (file), line);
+}
+
+/* Setup DC for reporting a diagnostic MESSAGE (an error or a WARNING),
+ using arguments pointed to by ARGS_PTR, issued at a location specified
+ by FILE and LINE. */
+
+void
+set_diagnostic_context (dc, message, args_ptr, file, line, warn)
+ diagnostic_context *dc;
+ const char *message;
+ va_list *args_ptr;
+ const char *file;
+ int line;
+ int warn;
+{
+ memset (dc, 0, sizeof (diagnostic_context));
+ diagnostic_message (dc) = message;
+ diagnostic_argument_list (dc) = args_ptr;
+ diagnostic_file_location (dc) = file;
+ diagnostic_line_location (dc) = line;
+ diagnostic_is_warning (dc) = warn;
+ diagnostic_starter (dc) = lang_diagnostic_starter;
+ diagnostic_finalizer (dc) = lang_diagnostic_finalizer;
+}
+
+void
+report_problematic_module (buffer)
+ output_buffer *buffer;
+{
+ struct file_stack *p;
+
+ if (output_needs_newline (buffer))
+ {
+ output_add_newline (buffer);
+ output_needs_newline (buffer) = 0;
+ }
+
+ if (input_file_stack && input_file_stack->next != 0
+ && error_module_changed ())
+ {
+ for (p = input_file_stack->next; p; p = p->next)
+ if (p == input_file_stack->next)
+ output_verbatim
+ (buffer, "In file included from %s:%d", p->name, p->line);
+ else
+ output_verbatim
+ (buffer, ",\n from %s:%d", p->name, p->line);
+ output_verbatim (buffer, ":\n");
+ record_last_error_module ();
+ }
+}
+
+static void
+default_diagnostic_starter (buffer, dc)
+ output_buffer *buffer;
+ diagnostic_context *dc;
+{
+ report_error_function (diagnostic_file_location (dc));
+ output_set_prefix (buffer,
+ context_as_prefix (diagnostic_file_location (dc),
+ diagnostic_line_location (dc),
+ diagnostic_is_warning (dc)));
+}
+
+static void
+default_diagnostic_finalizer (buffer, dc)
+ output_buffer *buffer;
+ diagnostic_context *dc __attribute__((__unused__));
+{
+ output_destroy_prefix (buffer);
+}
OSDN Git Service
