/* Language-independent diagnostic subroutines for the GNU C compiler
- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
Contributed by Gabriel Dos Reis <gdr@codesourcery.com>
-This file is part of GNU CC.
+This file is part of GCC.
-GNU CC 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 version.
+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
+version.
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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
-along with GNU CC; see the file COPYING. If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with GCC; see the file COPYING. If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA. */
/* This file implements the language independent aspect of diagnostic
#undef FLOAT /* This is for hpux. They should change hpux. */
#undef FFS /* Some systems define this in param.h. */
#include "system.h"
-
#include "tree.h"
-#include "rtl.h"
#include "tm_p.h"
#include "flags.h"
#include "input.h"
-#include "insn-attr.h"
-#include "insn-codes.h"
-#include "insn-config.h"
#include "toplev.h"
#include "intl.h"
#include "diagnostic.h"
#define output_formatted_integer(BUFFER, FORMAT, INTEGER) \
do { \
- sprintf (digit_buffer, FORMAT, INTEGER); \
- output_add_string (BUFFER, digit_buffer); \
+ sprintf ((BUFFER)->digit_buffer, FORMAT, INTEGER); \
+ output_add_string (BUFFER, (BUFFER)->digit_buffer); \
} while (0)
#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));
+/* Prototypes. */
+static void diagnostic_finish PARAMS ((output_buffer *));
static void output_do_verbatim PARAMS ((output_buffer *,
const char *, va_list *));
static void output_buffer_to_stream PARAMS ((output_buffer *));
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 *,
static void error_recursion PARAMS ((void)) ATTRIBUTE_NORETURN;
extern int rtl_dump_and_exit;
-extern int inhibit_warnings;
extern int warnings_are_errors;
-extern int warningcount;
-extern int errorcount;
-/* Front-end specific tree formatter, if non-NULL. */
-printer_fn lang_printer = NULL;
+/* A diagnostic_context surrogate for stderr. */
+static diagnostic_context global_diagnostic_context;
+diagnostic_context *global_dc = &global_diagnostic_context;
-/* 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;
+/* This will be removed shortly. */
+output_buffer *diagnostic_buffer = &global_diagnostic_context.buffer;
/* Function of last error message;
more generally, function such that if next error message is in it
/* Called by report_error_function to print out function name.
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.
- 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;
+void (*print_error_function) PARAMS ((diagnostic_context *, const char *))
+ = default_print_error_function;
/* Prevent recursion into the error handler. */
static int diagnostic_lock;
/* Initialize the diagnostic message outputting machinery. */
void
-initialize_diagnostics ()
+diagnostic_initialize (context)
+ diagnostic_context *context;
{
- /* By default, we don't line-wrap messages. */
- diagnostic_message_length_per_line = 0;
- set_message_prefixing_rule (DIAGNOSTICS_SHOW_PREFIX_ONCE);
+ memset (context, 0, sizeof *context);
+ obstack_init (&context->buffer.obstack);
- /* Proceed to actual initialization. */
- default_initialize_buffer (diagnostic_buffer);
+ /* By default, diagnostics are sent to stderr. */
+ output_buffer_attached_stream (&context->buffer) = stderr;
- lang_diagnostic_starter = default_diagnostic_starter;
- lang_diagnostic_finalizer = default_diagnostic_finalizer;
-}
+ /* By default, we emit prefixes once per message. */
+ diagnostic_prefixing_rule (context) = DIAGNOSTICS_SHOW_PREFIX_ONCE;
-void
-set_message_prefixing_rule (rule)
- int rule;
-{
- current_prefixing_rule = rule;
+ diagnostic_starter (context) = default_diagnostic_starter;
+ diagnostic_finalizer (context) = default_diagnostic_finalizer;
}
-/* Returns true if BUFFER is in line-wrappind mode. */
+/* Returns true if BUFFER is in line-wrapping mode. */
int
output_is_line_wrapping (buffer)
output_buffer *buffer;
{
- return ideal_line_wrap_cutoff (buffer) > 0;
+ return diagnostic_line_cutoff (buffer) > 0;
}
/* Return BUFFER's prefix. */
{
/* 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. */
+ not to increase unnecessarily 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);
+ || diagnostic_prefixing_rule (buffer) == DIAGNOSTICS_SHOW_PREFIX_ONCE
+ || diagnostic_prefixing_rule (buffer) == DIAGNOSTICS_SHOW_PREFIX_NEVER)
+ line_wrap_cutoff (buffer) = diagnostic_line_cutoff (buffer);
else
{
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;
+ if (diagnostic_line_cutoff (buffer) - prefix_length < 32)
+ line_wrap_cutoff (buffer) = diagnostic_line_cutoff (buffer) + 32;
else
- line_wrap_cutoff (buffer) = ideal_line_wrap_cutoff (buffer);
+ line_wrap_cutoff (buffer) = diagnostic_line_cutoff (buffer);
}
}
output_buffer *buffer;
int length;
{
- ideal_line_wrap_cutoff (buffer) = length;
+ diagnostic_line_cutoff (buffer) = length;
set_real_maximum_length (buffer);
}
memset (buffer, 0, sizeof (output_buffer));
obstack_init (&buffer->obstack);
output_buffer_attached_stream (buffer) = stderr;
- ideal_line_wrap_cutoff (buffer) = maximum_length;
- prefixing_policy (buffer) = current_prefixing_rule;
+ diagnostic_line_cutoff (buffer) = maximum_length;
+ diagnostic_prefixing_rule (buffer) = diagnostic_prefixing_rule (global_dc);
output_set_prefix (buffer, prefix);
output_text_length (buffer) = 0;
clear_diagnostic_info (buffer);
}
-/* Initialize BUFFER with a NULL prefix and current diagnostic message
- length cutoff. */
-
-void
-default_initialize_buffer (buffer)
- output_buffer *buffer;
-{
- init_output_buffer (buffer, NULL, diagnostic_message_length_per_line);
-}
-
-/* Recompute diagnostic_buffer's attributes to reflect any change
- in diagnostic formatting global options. */
-
-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);
-}
-
/* Reinitialize BUFFER. */
void
{
if (output_prefix (buffer) != NULL)
{
- switch (prefixing_policy (buffer))
+ switch (diagnostic_prefixing_rule (buffer))
{
default:
case DIAGNOSTICS_SHOW_PREFIX_NEVER:
while (start != end)
{
- /* Dump anything bodered by whitespaces. */
+ /* Dump anything bordered by whitespaces. */
{
const char *p = start;
while (p != end && *p != ' ' && *p != '\n')
if (*++output_buffer_text_cursor (buffer) != '*')
abort ();
else if (*++output_buffer_text_cursor (buffer) != 's')
- abort();
+ 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))
+ if (!buffer->format_decoder || !(*buffer->format_decoder) (buffer))
{
/* Hmmm. The front-end failed to install a format translator
but called us with an unrecognized format. Sorry. */
}
static char *
-vbuild_message_string (msgid, ap)
- const char *msgid;
+vbuild_message_string (msg, ap)
+ const char *msg;
va_list ap;
{
char *str;
- vasprintf (&str, msgid, ap);
+ vasprintf (&str, msg, ap);
return str;
}
-/* Return a malloc'd string containing MSGID formatted a la
- printf. The caller is reponsible for freeing the memory. */
+/* Return a malloc'd string containing MSG formatted a la
+ printf. The caller is responsible for freeing the memory. */
static char *
-build_message_string VPARAMS ((const char *msgid, ...))
+build_message_string VPARAMS ((const char *msg, ...))
{
-#ifndef ANSI_PROTOTYPES
- const char *msgid;
-#endif
- va_list ap;
char *str;
- VA_START (ap, msgid);
-
-#ifndef ANSI_PROTOTYPES
- msgid = va_arg (ap, const char *);
-#endif
+ VA_OPEN (ap, msg);
+ VA_FIXEDARG (ap, const char *, msg);
- str = vbuild_message_string (msgid, ap);
+ str = vbuild_message_string (msg, ap);
- va_end (ap);
+ VA_CLOSE (ap);
return str;
}
if (file)
{
if (warn)
- return build_message_string ("%s:%d: warning: ", file, line);
+ return build_message_string (_("%s:%d: warning: "), file, line);
else
return build_message_string ("%s:%d: ", file, line);
}
else
{
if (warn)
- return build_message_string ("%s: warning: ", progname);
+ return build_message_string (_("%s: warning: "), progname);
else
return build_message_string ("%s: ", progname);
}
/* Format a MESSAGE into BUFFER. Automatically wrap lines. */
static void
-output_do_printf (buffer, msgid)
+output_do_printf (buffer, msg)
output_buffer *buffer;
- const char *msgid;
+ const char *msg;
{
- char *message = vbuild_message_string (msgid,
+ char *message = vbuild_message_string (msg,
output_buffer_format_args (buffer));
wrap_text (buffer, message, message + strlen (message));
void
output_printf VPARAMS ((struct output_buffer *buffer, const char *msgid, ...))
{
-#ifndef ANSI_PROTOTYPES
- struct output_buffer *buffer;
- const char *msgid;
-#endif
- va_list ap;
va_list *old_args;
- VA_START (ap, msgid);
-#ifndef ANSI_PROTOTYPES
- buffer = va_arg (ap, output_buffer *);
- msgid = va_arg (ap, const char *);
-#endif
+ VA_OPEN (ap, msgid);
+ VA_FIXEDARG (ap, output_buffer *, buffer);
+ VA_FIXEDARG (ap, const char *, msgid);
+
old_args = output_buffer_ptr_to_format_args (buffer);
output_buffer_ptr_to_format_args (buffer) = ≈
- output_do_printf (buffer, msgid);
+ output_do_printf (buffer, _(msgid));
output_buffer_ptr_to_format_args (buffer) = old_args;
- va_end (ap);
-}
-
-/* Print the message MSGID in FILE. */
-
-static void
-vnotice (file, msgid, ap)
- FILE *file;
- const char *msgid;
- va_list ap;
-{
- vfprintf (file, _(msgid), ap);
+ VA_CLOSE (ap);
}
/* Print a message relevant to the given DECL. */
if (*p == '%') /* Print the name. */
{
- const char *n = (DECL_NAME (decl)
- ? (*decl_printable_name) (decl, 2)
- : _("((anonymous))"));
+ const char *const n = (DECL_NAME (decl)
+ ? (*decl_printable_name) (decl, 2)
+ : _("((anonymous))"));
output_add_string (buffer, n);
while (*p)
{
}
}
-/* Figure file and line of the given INSN. */
-
-static void
-file_and_line_for_asm (insn, pfile, pline)
- rtx insn;
- const char **pfile;
- int *pline;
-{
- 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 (asmop)
- {
- *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
-diagnostic_for_asm (insn, msg, args_ptr, warn)
- rtx insn;
- const char *msg;
- va_list *args_ptr;
- int warn;
-{
- 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);
-}
/* 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
-diagnostic_for_decl (decl, msg, args_ptr, warn)
+diagnostic_for_decl (decl, msgid, args_ptr, warn)
tree decl;
- const char *msg;
+ const char *msgid;
va_list *args_ptr;
int warn;
{
(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;
+ output_buffer_text_cursor (diagnostic_buffer) = _(msgid);
format_with_decl (diagnostic_buffer, decl);
- finish_diagnostic ();
+ diagnostic_finish ((output_buffer *) global_dc);
output_destroy_prefix (diagnostic_buffer);
output_buffer_state (diagnostic_buffer) = os;
count_error (warningp)
int warningp;
{
- if (warningp
- && (inhibit_warnings
- || (in_system_header && !warn_system_headers)))
+ if (warningp && !diagnostic_report_warnings_p ())
return 0;
if (warningp && !warnings_are_errors)
return 1;
}
-/* Print a diagnistic MSGID on FILE. */
+/* Print a diagnostic MSGID on FILE. This is just fprintf, except it
+ runs its second argument through gettext. */
void
fnotice VPARAMS ((FILE *file, const char *msgid, ...))
{
-#ifndef ANSI_PROTOTYPES
- FILE *file;
- const char *msgid;
-#endif
- va_list ap;
-
- VA_START (ap, msgid);
+ VA_OPEN (ap, msgid);
+ VA_FIXEDARG (ap, FILE *, file);
+ VA_FIXEDARG (ap, const char *, msgid);
-#ifndef ANSI_PROTOTYPES
- file = va_arg (ap, FILE *);
- msgid = va_arg (ap, const char *);
-#endif
-
- vnotice (file, msgid, ap);
- va_end (ap);
+ vfprintf (file, _(msgid), ap);
+ VA_CLOSE (ap);
}
void
fatal_io_error VPARAMS ((const char *msgid, ...))
{
-#ifndef ANSI_PROTOTYPES
- const char *msgid;
-#endif
- va_list ap;
output_state os;
- os = output_buffer_state (diagnostic_buffer);
- VA_START (ap, msgid);
+ VA_OPEN (ap, msgid);
+ VA_FIXEDARG (ap, const char *, msgid);
-#ifndef ANSI_PROTOTYPES
- msgid = va_arg (ap, const char *);
-#endif
+ os = output_buffer_state (diagnostic_buffer);
output_printf (diagnostic_buffer, "%s: %s: ", progname, xstrerror (errno));
output_buffer_ptr_to_format_args (diagnostic_buffer) = ≈
- output_buffer_text_cursor (diagnostic_buffer) = msgid;
+ output_buffer_text_cursor (diagnostic_buffer) = _(msgid);
output_format (diagnostic_buffer);
- finish_diagnostic ();
+ diagnostic_finish ((output_buffer *) global_dc);
output_buffer_state (diagnostic_buffer) = os;
- va_end (ap);
+ VA_CLOSE (ap);
exit (FATAL_EXIT_CODE);
}
void
pedwarn VPARAMS ((const char *msgid, ...))
{
-#ifndef ANSI_PROTOTYPES
- const char *msgid;
-#endif
- va_list ap;
diagnostic_context dc;
- VA_START (ap, msgid);
-
-#ifndef ANSI_PROTOTYPES
- msgid = va_arg (ap, const char *);
-#endif
+ VA_OPEN (ap, msgid);
+ VA_FIXEDARG (ap, const char *, msgid);
set_diagnostic_context
(&dc, msgid, &ap, input_filename, lineno, !flag_pedantic_errors);
report_diagnostic (&dc);
- va_end (ap);
+ VA_CLOSE (ap);
}
/* Issue a pedantic waring about DECL. */
void
pedwarn_with_decl VPARAMS ((tree decl, const char *msgid, ...))
{
-#ifndef ANSI_PROTOTYPES
- tree decl;
- const char *msgid;
-#endif
- va_list ap;
+ VA_OPEN (ap, msgid);
+ VA_FIXEDARG (ap, tree, decl);
+ VA_FIXEDARG (ap, const char *, msgid);
- VA_START (ap, msgid);
-
-#ifndef ANSI_PROTOTYPES
- decl = va_arg (ap, tree);
- msgid = va_arg (ap, const char *);
-#endif
/* 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
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);
+ VA_CLOSE (ap);
}
-/* Same as above but within the context FILE and LINE. */
+/* 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, ...))
{
-#ifndef ANSI_PROTOTYPES
- const char *file;
- int line;
- const char *msgid;
-#endif
- va_list ap;
diagnostic_context dc;
- VA_START (ap, msgid);
-
-#ifndef ANSI_PROTOTYPES
- file = va_arg (ap, const char *);
- line = va_arg (ap, int);
- msgid = va_arg (ap, const char *);
-#endif
+ VA_OPEN (ap, msgid);
+ VA_FIXEDARG (ap, const char *, file);
+ VA_FIXEDARG (ap, int, line);
+ VA_FIXEDARG (ap, const char *, msgid);
set_diagnostic_context (&dc, msgid, &ap, file, line, !flag_pedantic_errors);
report_diagnostic (&dc);
- va_end (ap);
+ VA_CLOSE (ap);
}
/* Just apologize with MSGID. */
void
sorry VPARAMS ((const char *msgid, ...))
{
-#ifndef ANSI_PROTOTYPES
- const char *msgid;
-#endif
- va_list ap;
output_state os;
- os = output_buffer_state (diagnostic_buffer);
- VA_START (ap, msgid);
+ VA_OPEN (ap, msgid);
+ VA_FIXEDARG (ap, const char *, msgid);
-#ifndef ANSI_PROTOTYPES
- msgid = va_arg (ap, const char *);
-#endif
++sorrycount;
+ os = output_buffer_state (diagnostic_buffer);
+
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_buffer_text_cursor (diagnostic_buffer) = _(msgid);
output_format (diagnostic_buffer);
- finish_diagnostic ();
+ diagnostic_finish ((output_buffer *) global_dc);
output_buffer_state (diagnostic_buffer) = os;
- va_end (ap);
+ VA_CLOSE (ap);
}
/* Called when the start of a function definition is parsed,
an error. */
void
-default_print_error_function (file)
- const char *file;
+default_print_error_function (context, file)
+ diagnostic_context *context;
+ const char *file;
{
if (error_function_changed ())
{
char *prefix = file ? build_message_string ("%s: ", file) : NULL;
output_state os;
- os = output_buffer_state (diagnostic_buffer);
- output_set_prefix (diagnostic_buffer, prefix);
+ os = output_buffer_state (context);
+ output_set_prefix ((output_buffer *) context, prefix);
if (current_function_decl == NULL)
- output_add_string (diagnostic_buffer, "At top level:");
+ output_add_string ((output_buffer *) context, _("At top level:"));
else
{
if (TREE_CODE (TREE_TYPE (current_function_decl)) == METHOD_TYPE)
output_printf
- (diagnostic_buffer, "In method `%s':",
+ ((output_buffer *) context, "In member function `%s':",
(*decl_printable_name) (current_function_decl, 2));
else
output_printf
- (diagnostic_buffer, "In function `%s':",
+ ((output_buffer *) context, "In function `%s':",
(*decl_printable_name) (current_function_decl, 2));
}
- output_add_newline (diagnostic_buffer);
+ output_add_newline ((output_buffer *) context);
record_last_error_function ();
- output_buffer_to_stream (diagnostic_buffer);
- output_buffer_state (diagnostic_buffer) = os;
+ output_buffer_to_stream ((output_buffer *) context);
+ output_buffer_state (context) = os;
free ((char*) prefix);
}
}
report_error_function (file)
const char *file ATTRIBUTE_UNUSED;
{
- report_problematic_module (diagnostic_buffer);
- (*print_error_function) (input_filename);
+ report_problematic_module ((output_buffer *) global_dc);
+ (*print_error_function) (global_dc, input_filename);
}
void
error_with_file_and_line VPARAMS ((const char *file, int line,
const char *msgid, ...))
{
-#ifndef ANSI_PROTOTYPES
- const char *file;
- int line;
- const char *msgid;
-#endif
- va_list ap;
diagnostic_context dc;
- VA_START (ap, msgid);
-
-#ifndef ANSI_PROTOTYPES
- file = va_arg (ap, const char *);
- line = va_arg (ap, int);
- msgid = va_arg (ap, const char *);
-#endif
+ VA_OPEN (ap, msgid);
+ VA_FIXEDARG (ap, const char *, file);
+ VA_FIXEDARG (ap, int, line);
+ VA_FIXEDARG (ap, const char *, msgid);
set_diagnostic_context (&dc, msgid, &ap, file, line, /* warn = */ 0);
report_diagnostic (&dc);
- va_end (ap);
+ VA_CLOSE (ap);
}
void
error_with_decl VPARAMS ((tree decl, const char *msgid, ...))
{
-#ifndef ANSI_PROTOTYPES
- tree decl;
- const char *msgid;
-#endif
- va_list ap;
-
- VA_START (ap, msgid);
-
-#ifndef ANSI_PROTOTYPES
- decl = va_arg (ap, tree);
- msgid = va_arg (ap, const char *);
-#endif
+ VA_OPEN (ap, msgid);
+ VA_FIXEDARG (ap, tree, decl);
+ VA_FIXEDARG (ap, const char *, msgid);
diagnostic_for_decl (decl, msgid, &ap, /* warn = */ 0);
- va_end (ap);
+ VA_CLOSE (ap);
}
-void
-error_for_asm VPARAMS ((rtx insn, const char *msgid, ...))
-{
-#ifndef ANSI_PROTOTYPES
- rtx insn;
- const char *msgid;
-#endif
- va_list ap;
-
- VA_START (ap, msgid);
-
-#ifndef ANSI_PROTOTYPES
- insn = va_arg (ap, rtx);
- msgid = va_arg (ap, const char *);
-#endif
-
- diagnostic_for_asm (insn, msgid, &ap, /* warn = */ 0);
- va_end (ap);
-}
/* Report an error message. The arguments are like that of printf. */
void
error VPARAMS ((const char *msgid, ...))
{
-#ifndef ANSI_PROTOTYPES
- const char *msgid;
-#endif
- va_list ap;
diagnostic_context dc;
- VA_START (ap, msgid);
-
-#ifndef ANSI_PROTOTYPES
- msgid = va_arg (ap, const char *);
-#endif
+ VA_OPEN (ap, msgid);
+ VA_FIXEDARG (ap, const char *, msgid);
set_diagnostic_context
(&dc, msgid, &ap, input_filename, lineno, /* warn = */ 0);
report_diagnostic (&dc);
- va_end (ap);
+ VA_CLOSE (ap);
}
/* Likewise, except that the compilation is terminated after printing the
void
fatal_error VPARAMS ((const char *msgid, ...))
{
-#ifndef ANSI_PROTOTYPES
- const char *msgid;
-#endif
- va_list ap;
diagnostic_context dc;
- VA_START (ap, msgid);
-
-#ifndef ANSI_PROTOTYPES
- msgid = va_arg (ap, const char *);
-#endif
+ VA_OPEN (ap, msgid);
+ VA_FIXEDARG (ap, const char *, msgid);
set_diagnostic_context
(&dc, msgid, &ap, input_filename, lineno, /* warn = */ 0);
report_diagnostic (&dc);
- va_end (ap);
+ VA_CLOSE (ap);
- fprintf (stderr, "compilation terminated.\n");
+ fnotice (stderr, "compilation terminated.\n");
exit (FATAL_EXIT_CODE);
}
void
internal_error VPARAMS ((const char *msgid, ...))
{
-#ifndef ANSI_PROTOTYPES
- const char *msgid;
-#endif
- va_list ap;
diagnostic_context dc;
- VA_START (ap, msgid);
+ VA_OPEN (ap, msgid);
+ VA_FIXEDARG (ap, const char *, msgid);
-#ifndef ANSI_PROTOTYPES
- msgid = va_arg (ap, const char *);
-#endif
+ if (diagnostic_lock)
+ error_recursion ();
+#ifndef ENABLE_CHECKING
if (errorcount > 0 || sorrycount > 0)
{
- fprintf (stderr, "%s:%d: confused by earlier errors, bailing out\n",
+ fnotice (stderr, "%s:%d: confused by earlier errors, bailing out\n",
input_filename, lineno);
exit (FATAL_EXIT_CODE);
}
+#endif
if (internal_error_function != 0)
(*internal_error_function) (_(msgid), &ap);
set_diagnostic_context
(&dc, msgid, &ap, input_filename, lineno, /* warn = */0);
report_diagnostic (&dc);
- va_end (ap);
+ VA_CLOSE (ap);
- fprintf (stderr, "Please submit a full bug report, ");
- fprintf (stderr, "with preprocessed source if appropriate.\n");
- fprintf (stderr, "See %s for instructions.\n", GCCBUGURL);
+ fnotice (stderr,
+"Please submit a full bug report,\n\
+with preprocessed source if appropriate.\n\
+See %s for instructions.\n", GCCBUGURL);
exit (FATAL_EXIT_CODE);
}
void
-_fatal_insn (msgid, insn, file, line, function)
- const char *msgid;
- rtx insn;
- const char *file;
- int line;
- const char *function;
-{
- error ("%s", msgid);
-
- /* The above incremented error_count, but isn't an error that we want to
- count, so reset it here. */
- errorcount--;
-
- debug_rtx (insn);
- fancy_abort (file, line, function);
-}
-
-void
-_fatal_insn_not_found (insn, file, line, function)
- rtx insn;
- const char *file;
- int line;
- const char *function;
-{
- if (INSN_CODE (insn) < 0)
- _fatal_insn ("Unrecognizable insn:", insn, file, line, function);
- else
- _fatal_insn ("Insn does not satisfy its constraints:",
- insn, file, line, function);
-}
-
-void
warning_with_file_and_line VPARAMS ((const char *file, int line,
const char *msgid, ...))
{
-#ifndef ANSI_PROTOTYPES
- const char *file;
- int line;
- const char *msgid;
-#endif
- va_list ap;
diagnostic_context dc;
- VA_START (ap, msgid);
-
-#ifndef ANSI_PROTOTYPES
- file = va_arg (ap, const char *);
- line = va_arg (ap, int);
- msgid = va_arg (ap, const char *);
-#endif
+ VA_OPEN (ap, msgid);
+ VA_FIXEDARG (ap, const char *, file);
+ VA_FIXEDARG (ap, int, line);
+ VA_FIXEDARG (ap, const char *, msgid);
set_diagnostic_context (&dc, msgid, &ap, file, line, /* warn = */ 1);
report_diagnostic (&dc);
- va_end (ap);
+ VA_CLOSE (ap);
}
void
warning_with_decl VPARAMS ((tree decl, const char *msgid, ...))
{
-#ifndef ANSI_PROTOTYPES
- tree decl;
- const char *msgid;
-#endif
- va_list ap;
-
- VA_START (ap, msgid);
-
-#ifndef ANSI_PROTOTYPES
- decl = va_arg (ap, tree);
- msgid = va_arg (ap, const char *);
-#endif
+ VA_OPEN (ap, msgid);
+ VA_FIXEDARG (ap, tree, decl);
+ VA_FIXEDARG (ap, const char *, msgid);
diagnostic_for_decl (decl, msgid, &ap, /* warn = */ 1);
- va_end (ap);
-}
-
-void
-warning_for_asm VPARAMS ((rtx insn, const char *msgid, ...))
-{
-#ifndef ANSI_PROTOTYPES
- rtx insn;
- const char *msgid;
-#endif
- va_list ap;
-
- VA_START (ap, msgid);
-
-#ifndef ANSI_PROTOTYPES
- insn = va_arg (ap, rtx);
- msgid = va_arg (ap, const char *);
-#endif
-
- diagnostic_for_asm (insn, msgid, &ap, /* warn = */ 1);
- va_end (ap);
+ VA_CLOSE (ap);
}
void
warning VPARAMS ((const char *msgid, ...))
{
-#ifndef ANSI_PROTOTYPES
- const char *msgid;
-#endif
- va_list ap;
diagnostic_context dc;
- VA_START (ap, msgid);
-
-#ifndef ANSI_PROTOTYPES
- msgid = va_arg (ap, const char *);
-#endif
+ VA_OPEN (ap, msgid);
+ VA_FIXEDARG (ap, const char *, msgid);
set_diagnostic_context
(&dc, msgid, &ap, input_filename, lineno, /* warn = */ 1);
report_diagnostic (&dc);
- va_end (ap);
+ VA_CLOSE (ap);
}
/* Flush diagnostic_buffer content on stderr. */
static void
-finish_diagnostic ()
+diagnostic_finish (buffer)
+ output_buffer *buffer;
{
- output_buffer_to_stream (diagnostic_buffer);
- clear_diagnostic_info (diagnostic_buffer);
- fputc ('\n', output_buffer_attached_stream (diagnostic_buffer));
- fflush (output_buffer_attached_stream (diagnostic_buffer));
+ output_buffer_to_stream (buffer);
+ clear_diagnostic_info (buffer);
+ fputc ('\n', output_buffer_attached_stream (buffer));
+ fflush (output_buffer_attached_stream (buffer));
}
-/* Helper subroutine of output_verbatim and verbatim. Do the approriate
+/* Helper subroutine of output_verbatim and verbatim. Do the appropriate
settings needed by BUFFER for a verbatim formatting. */
static void
-output_do_verbatim (buffer, msg, args_ptr)
+output_do_verbatim (buffer, msgid, args_ptr)
output_buffer *buffer;
- const char *msg;
+ const char *msgid;
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;
+ diagnostic_prefixing_rule (buffer) = DIAGNOSTICS_SHOW_PREFIX_NEVER;
+ output_buffer_text_cursor (buffer) = _(msgid);
output_buffer_ptr_to_format_args (buffer) = args_ptr;
output_set_maximum_length (buffer, 0);
output_format (buffer);
/* Output MESSAGE verbatim into BUFFER. */
void
-output_verbatim VPARAMS ((output_buffer *buffer, const char *msg, ...))
+output_verbatim VPARAMS ((output_buffer *buffer, const char *msgid, ...))
{
-#ifndef ANSI_PROTOTYPES
- output_buffer *buffer;
- const char *msg;
-#endif
- va_list ap;
+ VA_OPEN (ap, msgid);
+ VA_FIXEDARG (ap, output_buffer *, buffer);
+ VA_FIXEDARG (ap, const char *, msgid);
- 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);
+ output_do_verbatim (buffer, msgid, &ap);
+ VA_CLOSE (ap);
}
/* Same as above but use diagnostic_buffer. */
void
-verbatim VPARAMS ((const char *msg, ...))
+verbatim VPARAMS ((const char *msgid, ...))
{
-#ifndef ANSI_PROTOTYPES
- const char *msg;
-#endif
- va_list ap;
+ VA_OPEN (ap, msgid);
+ VA_FIXEDARG (ap, const char *, msgid);
- VA_START (ap, msg);
-#ifndef ANSI_PROTOTYPES
- msg = va_arg (ap, const char *);
-#endif
- output_do_verbatim (diagnostic_buffer, msg, &ap);
+ output_do_verbatim (diagnostic_buffer, msgid, &ap);
output_buffer_to_stream (diagnostic_buffer);
- va_end (ap);
+ VA_CLOSE (ap);
}
/* Report a diagnostic message (an error or a warning) as specified by
(*diagnostic_starter (dc)) (diagnostic_buffer, dc);
output_format (diagnostic_buffer);
(*diagnostic_finalizer (dc)) (diagnostic_buffer, dc);
- finish_diagnostic ();
+ diagnostic_finish ((output_buffer *) global_dc);
output_buffer_state (diagnostic_buffer) = os;
}
/* 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. */
+ so give up now. But do try to flush out the previous error.
+ This mustn't use internal_error, that will cause infinite recursion. */
static void
error_recursion ()
{
if (diagnostic_lock < 3)
- finish_diagnostic ();
-
- internal_error
- ("Internal compiler error: Error reporting routines re-entered.");
+ diagnostic_finish ((output_buffer *) global_dc);
+
+ fnotice (stderr,
+ "Internal compiler error: Error reporting routines re-entered.\n");
+ fnotice (stderr,
+"Please submit a full bug report,\n\
+with preprocessed source if appropriate.\n\
+See %s for instructions.\n", GCCBUGURL);
+ exit (FATAL_EXIT_CODE);
}
/* Given a partial pathname as input, return another pathname that
by FILE and LINE. */
void
-set_diagnostic_context (dc, message, args_ptr, file, line, warn)
+set_diagnostic_context (dc, msgid, args_ptr, file, line, warn)
diagnostic_context *dc;
- const char *message;
+ const char *msgid;
va_list *args_ptr;
const char *file;
int line;
int warn;
{
memset (dc, 0, sizeof (diagnostic_context));
- diagnostic_message (dc) = message;
+ diagnostic_message (dc) = _(msgid);
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;
+ diagnostic_starter (dc) = diagnostic_starter (global_dc);
+ diagnostic_finalizer (dc) = diagnostic_finalizer (global_dc);
}
void
{
output_destroy_prefix (buffer);
}
+
+void
+warn_deprecated_use (node)
+ tree node;
+{
+ if (node == 0 || !warn_deprecated_decl)
+ return;
+
+ if (DECL_P (node))
+ warning ("`%s' is deprecated (declared at %s:%d)",
+ IDENTIFIER_POINTER (DECL_NAME (node)),
+ DECL_SOURCE_FILE (node), DECL_SOURCE_LINE (node));
+ else if (TYPE_P (node))
+ {
+ const char *what = NULL;
+ tree decl = TYPE_STUB_DECL (node);
+
+ if (TREE_CODE (TYPE_NAME (node)) == IDENTIFIER_NODE)
+ what = IDENTIFIER_POINTER (TYPE_NAME (node));
+ else if (TREE_CODE (TYPE_NAME (node)) == TYPE_DECL
+ && DECL_NAME (TYPE_NAME (node)))
+ what = IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (node)));
+
+ if (what)
+ {
+ if (decl)
+ warning ("`%s' is deprecated (declared at %s:%d)", what,
+ DECL_SOURCE_FILE (decl), DECL_SOURCE_LINE (decl));
+ else
+ warning ("`%s' is deprecated", what);
+ }
+ else if (decl)
+ warning ("type is deprecated (declared at %s:%d)",
+ DECL_SOURCE_FILE (decl), DECL_SOURCE_LINE (decl));
+ else
+ warning ("type is deprecated");
+ }
+}
OSDN Git Service
