OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

diagnostic.c (vnotice): Kill.

Browse Source 
2001-05-23  Zack Weinberg  <zackw@stanford.edu>

	* diagnostic.c (vnotice): Kill.
	(fnotice): Call vfprintf directly.
	(diagnostic_for_decl, output_do_verbatim, output_verbatim,
	verbatim, set_diagnostic_context): Rename string argument to
	indicate that it is run through gettext.
	(vbuild_message_string, build_message_string, output_do_printf):
	Rename string argument to indicate that it is NOT run through
	gettext.
	(output_printf, diagnostic_for_decl, fatal_io_error, sorry,
	output_do_verbatim, set_diagnostic_context, fnotice, _fatal_insn):
	Run msgid argument through gettext.
	(default_print_error_function): Run constant strings through
	gettext when nothing else will.
	(fatal_error, internal_error, error_recursion): Use fnotice.
	Present complete sentences to gettext.

From-SVN: r42498
This commit is contained in:
Zack Weinberg 2001-05-23 17:15:07 +00:00 committed by Zack Weinberg
parent 13094d1293
commit 1f8875f91d
2 changed files with 74 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gcc/ChangeLog
View File

@ -1,3 +1,21 @@
2001-05-23 Zack Weinberg <zackw@stanford.edu>
* diagnostic.c (vnotice): Kill.
(fnotice): Call vfprintf directly.
(diagnostic_for_decl, output_do_verbatim, output_verbatim,
verbatim, set_diagnostic_context): Rename string argument to
indicate that it is run through gettext.
(vbuild_message_string, build_message_string, output_do_printf):
Rename string argument to indicate that it is NOT run through
gettext.
(output_printf, diagnostic_for_decl, fatal_io_error, sorry,
output_do_verbatim, set_diagnostic_context, fnotice, _fatal_insn):
Run msgid argument through gettext.
(default_print_error_function): Run constant strings through
gettext when nothing else will.
(fatal_error, internal_error, error_recursion): Use fnotice.
Present complete sentences to gettext.
2001-05-23 Mark Mitchell <mark@codesourcery.com> 2001-05-23 Mark Mitchell <mark@codesourcery.com>
* jump.c (mark_jump_label): Fix thinko in 2001-05-19 change. * jump.c (mark_jump_label): Fix thinko in 2001-05-19 change.

117
gcc/diagnostic.c
View File

@ -78,10 +78,8 @@ static void format_with_decl PARAMS ((output_buffer *, tree));
static void file_and_line_for_asm PARAMS ((rtx, const char **, int *)); 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_asm PARAMS ((rtx, const char *, va_list *, int));
static void diagnostic_for_decl PARAMS ((tree, 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 set_real_maximum_length PARAMS ((output_buffer *));
static void output_unsigned_decimal PARAMS ((output_buffer *, unsigned int)); static void output_unsigned_decimal PARAMS ((output_buffer *, unsigned int));
static void output_long_decimal PARAMS ((output_buffer *, long int)); static void output_long_decimal PARAMS ((output_buffer *, long int));
static void output_long_unsigned_decimal PARAMS ((output_buffer *, static void output_long_unsigned_decimal PARAMS ((output_buffer *,
@ -797,35 +795,35 @@ output_format (buffer)
} }
static char * static char *
vbuild_message_string (msgid, ap) vbuild_message_string (msg, ap)
const char *msgid; const char *msg;
va_list ap; va_list ap;
{ {
char *str; char *str;
vasprintf (&str, msgid, ap); vasprintf (&str, msg, ap);
return str; return str;
} }
/* Return a malloc'd string containing MSGID formatted a la /* Return a malloc'd string containing MSG formatted a la
printf. The caller is reponsible for freeing the memory. */ printf. The caller is reponsible for freeing the memory. */
static char * static char *
build_message_string VPARAMS ((const char *msgid, ...)) build_message_string VPARAMS ((const char *msg, ...))
{ {
#ifndef ANSI_PROTOTYPES #ifndef ANSI_PROTOTYPES
const char *msgid; const char *msg;
#endif #endif
va_list ap; va_list ap;
char *str; char *str;
VA_START (ap, msgid); VA_START (ap, msg);
#ifndef ANSI_PROTOTYPES #ifndef ANSI_PROTOTYPES
msgid = va_arg (ap, const char *); msg = va_arg (ap, const char *);
#endif #endif
str = vbuild_message_string (msgid, ap); str = vbuild_message_string (msg, ap);
va_end (ap); va_end (ap);
@ -844,14 +842,14 @@ context_as_prefix (file, line, warn)
if (file) if (file)
{ {
if (warn) if (warn)
return build_message_string ("%s:%d: warning: ", file, line); return build_message_string (_("%s:%d: warning: "), file, line);
else else
return build_message_string ("%s:%d: ", file, line); return build_message_string ("%s:%d: ", file, line);
} }
else else
{ {
if (warn) if (warn)
return build_message_string ("%s: warning: ", progname); return build_message_string (_("%s: warning: "), progname);
else else
return build_message_string ("%s: ", progname); return build_message_string ("%s: ", progname);
} }
@ -869,11 +867,11 @@ file_name_as_prefix (f)
/* Format a MESSAGE into BUFFER. Automatically wrap lines. */ /* Format a MESSAGE into BUFFER. Automatically wrap lines. */
static void static void
output_do_printf (buffer, msgid) output_do_printf (buffer, msg)
output_buffer *buffer; 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)); output_buffer_format_args (buffer));
wrap_text (buffer, message, message + strlen (message)); wrap_text (buffer, message, message + strlen (message));
@ -900,22 +898,11 @@ output_printf VPARAMS ((struct output_buffer *buffer, const char *msgid, ...))
#endif #endif
old_args = output_buffer_ptr_to_format_args (buffer); old_args = output_buffer_ptr_to_format_args (buffer);
output_buffer_ptr_to_format_args (buffer) = &ap; output_buffer_ptr_to_format_args (buffer) = &ap;
output_do_printf (buffer, msgid); output_do_printf (buffer, _(msgid));
output_buffer_ptr_to_format_args (buffer) = old_args; output_buffer_ptr_to_format_args (buffer) = old_args;
va_end (ap); 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);
}
/* Print a message relevant to the given DECL. */ /* Print a message relevant to the given DECL. */
static void static void
@ -1026,9 +1013,9 @@ diagnostic_for_asm (insn, msg, args_ptr, warn)
name; subsequent substitutions are a la output_format. */ name; subsequent substitutions are a la output_format. */
static void static void
diagnostic_for_decl (decl, msg, args_ptr, warn) diagnostic_for_decl (decl, msgid, args_ptr, warn)
tree decl; tree decl;
const char *msg; const char *msgid;
va_list *args_ptr; va_list *args_ptr;
int warn; int warn;
{ {
@ -1045,7 +1032,7 @@ diagnostic_for_decl (decl, msg, args_ptr, warn)
(diagnostic_buffer, context_as_prefix (diagnostic_buffer, context_as_prefix
(DECL_SOURCE_FILE (decl), DECL_SOURCE_LINE (decl), warn)); (DECL_SOURCE_FILE (decl), DECL_SOURCE_LINE (decl), warn));
output_buffer_ptr_to_format_args (diagnostic_buffer) = args_ptr; 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); format_with_decl (diagnostic_buffer, decl);
finish_diagnostic (); finish_diagnostic ();
output_destroy_prefix (diagnostic_buffer); output_destroy_prefix (diagnostic_buffer);
@ -1084,7 +1071,8 @@ count_error (warningp)
return 1; 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 void
fnotice VPARAMS ((FILE *file, const char *msgid, ...)) fnotice VPARAMS ((FILE *file, const char *msgid, ...))
@ -1102,7 +1090,7 @@ fnotice VPARAMS ((FILE *file, const char *msgid, ...))
msgid = va_arg (ap, const char *); msgid = va_arg (ap, const char *);
#endif #endif
vnotice (file, msgid, ap); vfprintf (file, _(msgid), ap);
va_end (ap); va_end (ap);
} }
@ -1128,7 +1116,7 @@ fatal_io_error VPARAMS ((const char *msgid, ...))
output_printf (diagnostic_buffer, "%s: %s: ", progname, xstrerror (errno)); output_printf (diagnostic_buffer, "%s: %s: ", progname, xstrerror (errno));
output_buffer_ptr_to_format_args (diagnostic_buffer) = &ap; output_buffer_ptr_to_format_args (diagnostic_buffer) = &ap;
output_buffer_text_cursor (diagnostic_buffer) = msgid; output_buffer_text_cursor (diagnostic_buffer) = _(msgid);
output_format (diagnostic_buffer); output_format (diagnostic_buffer);
finish_diagnostic (); finish_diagnostic ();
output_buffer_state (diagnostic_buffer) = os; output_buffer_state (diagnostic_buffer) = os;
@ -1236,7 +1224,7 @@ sorry VPARAMS ((const char *msgid, ...))
(diagnostic_buffer, context_as_prefix (input_filename, lineno, 0)); (diagnostic_buffer, context_as_prefix (input_filename, lineno, 0));
output_printf (diagnostic_buffer, "sorry, not implemented: "); output_printf (diagnostic_buffer, "sorry, not implemented: ");
output_buffer_ptr_to_format_args (diagnostic_buffer) = &ap; output_buffer_ptr_to_format_args (diagnostic_buffer) = &ap;
output_buffer_text_cursor (diagnostic_buffer) = msgid; output_buffer_text_cursor (diagnostic_buffer) = _(msgid);
output_format (diagnostic_buffer); output_format (diagnostic_buffer);
finish_diagnostic (); finish_diagnostic ();
output_buffer_state (diagnostic_buffer) = os; output_buffer_state (diagnostic_buffer) = os;
@ -1278,7 +1266,7 @@ default_print_error_function (file)
output_set_prefix (diagnostic_buffer, prefix); output_set_prefix (diagnostic_buffer, prefix);
if (current_function_decl == NULL) if (current_function_decl == NULL)
output_add_string (diagnostic_buffer, "At top level:"); output_add_string (diagnostic_buffer, _("At top level:"));
else else
{ {
if (TREE_CODE (TREE_TYPE (current_function_decl)) == METHOD_TYPE) if (TREE_CODE (TREE_TYPE (current_function_decl)) == METHOD_TYPE)
@ -1422,7 +1410,7 @@ fatal_error VPARAMS ((const char *msgid, ...))
report_diagnostic (&dc); report_diagnostic (&dc);
va_end (ap); va_end (ap);
fprintf (stderr, "compilation terminated.\n"); fnotice (stderr, "compilation terminated.\n");
exit (FATAL_EXIT_CODE); exit (FATAL_EXIT_CODE);
} }
@ -1457,7 +1445,7 @@ internal_error VPARAMS ((const char *msgid, ...))
if (errorcount > 0 || sorrycount > 0) 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); input_filename, lineno);
exit (FATAL_EXIT_CODE); exit (FATAL_EXIT_CODE);
} }
@ -1470,9 +1458,10 @@ internal_error VPARAMS ((const char *msgid, ...))
report_diagnostic (&dc); report_diagnostic (&dc);
va_end (ap); va_end (ap);
fprintf (stderr, "Please submit a full bug report, "); fnotice (stderr,
fprintf (stderr, "with preprocessed source if appropriate.\n"); "Please submit a full bug report,\n\
fprintf (stderr, "See %s for instructions.\n", GCCBUGURL); with preprocessed source if appropriate.\n\
See %s for instructions.\n", GCCBUGURL);
exit (FATAL_EXIT_CODE); exit (FATAL_EXIT_CODE);
} }
@ -1484,7 +1473,7 @@ _fatal_insn (msgid, insn, file, line, function)
int line; int line;
const char *function; const char *function;
{ {
error ("%s", msgid); error ("%s", _(msgid));
/* The above incremented error_count, but isn't an error that we want to /* The above incremented error_count, but isn't an error that we want to
count, so reset it here. */ count, so reset it here. */
@ -1609,9 +1598,9 @@ finish_diagnostic ()
settings needed by BUFFER for a verbatim formatting. */ settings needed by BUFFER for a verbatim formatting. */
static void static void
output_do_verbatim (buffer, msg, args_ptr) output_do_verbatim (buffer, msgid, args_ptr)
output_buffer *buffer; output_buffer *buffer;
const char *msg; const char *msgid;
va_list *args_ptr; va_list *args_ptr;
{ {
output_state os; output_state os;
@ -1619,7 +1608,7 @@ output_do_verbatim (buffer, msg, args_ptr)
os = output_buffer_state (buffer); os = output_buffer_state (buffer);
output_prefix (buffer) = NULL; output_prefix (buffer) = NULL;
prefixing_policy (buffer) = DIAGNOSTICS_SHOW_PREFIX_NEVER; prefixing_policy (buffer) = DIAGNOSTICS_SHOW_PREFIX_NEVER;
output_buffer_text_cursor (buffer) = msg; output_buffer_text_cursor (buffer) = _(msgid);
output_buffer_ptr_to_format_args (buffer) = args_ptr; output_buffer_ptr_to_format_args (buffer) = args_ptr;
output_set_maximum_length (buffer, 0); output_set_maximum_length (buffer, 0);
output_format (buffer); output_format (buffer);
@ -1629,38 +1618,38 @@ output_do_verbatim (buffer, msg, args_ptr)
/* Output MESSAGE verbatim into BUFFER. */ /* Output MESSAGE verbatim into BUFFER. */
void void
output_verbatim VPARAMS ((output_buffer *buffer, const char *msg, ...)) output_verbatim VPARAMS ((output_buffer *buffer, const char *msgid, ...))
{ {
#ifndef ANSI_PROTOTYPES #ifndef ANSI_PROTOTYPES
output_buffer *buffer; output_buffer *buffer;
const char *msg; const char *msgid;
#endif #endif
va_list ap; va_list ap;
VA_START (ap, msg); VA_START (ap, msgid);
#ifndef ANSI_PROTOTYPES #ifndef ANSI_PROTOTYPES
buffer = va_arg (ap, output_buffer *); buffer = va_arg (ap, output_buffer *);
msg = va_arg (ap, const char *); msg = va_arg (ap, const char *);
#endif #endif
output_do_verbatim (buffer, msg, &ap); output_do_verbatim (buffer, msgid, &ap);
va_end (ap); va_end (ap);
} }
/* Same as above but use diagnostic_buffer. */ /* Same as above but use diagnostic_buffer. */
void void
verbatim VPARAMS ((const char *msg, ...)) verbatim VPARAMS ((const char *msgid, ...))
{ {
#ifndef ANSI_PROTOTYPES #ifndef ANSI_PROTOTYPES
const char *msg; const char *msgid;
#endif #endif
va_list ap; va_list ap;
VA_START (ap, msg); VA_START (ap, msgid);
#ifndef ANSI_PROTOTYPES #ifndef ANSI_PROTOTYPES
msg = va_arg (ap, const char *); msgid = va_arg (ap, const char *);
#endif #endif
output_do_verbatim (diagnostic_buffer, msg, &ap); output_do_verbatim (diagnostic_buffer, msgid, &ap);
output_buffer_to_stream (diagnostic_buffer); output_buffer_to_stream (diagnostic_buffer);
va_end (ap); va_end (ap);
} }
@ -1697,7 +1686,8 @@ report_diagnostic (dc)
/* Inform the user that an error occurred while trying to report some /* Inform the user that an error occurred while trying to report some
other error. This indicates catastrophic internal inconsistencies, 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 static void
error_recursion () error_recursion ()
@ -1705,8 +1695,13 @@ error_recursion ()
if (diagnostic_lock < 3) if (diagnostic_lock < 3)
finish_diagnostic (); finish_diagnostic ();
internal_error fnotice (stderr,
("Internal compiler error: Error reporting routines re-entered."); "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 /* Given a partial pathname as input, return another pathname that
@ -1772,16 +1767,16 @@ fancy_abort (file, line, function)
by FILE and LINE. */ by FILE and LINE. */
void void
set_diagnostic_context (dc, message, args_ptr, file, line, warn) set_diagnostic_context (dc, msgid, args_ptr, file, line, warn)
diagnostic_context *dc; diagnostic_context *dc;
const char *message; const char *msgid;
va_list *args_ptr; va_list *args_ptr;
const char *file; const char *file;
int line; int line;
int warn; int warn;
{ {
memset (dc, 0, sizeof (diagnostic_context)); memset (dc, 0, sizeof (diagnostic_context));
diagnostic_message (dc) = message; diagnostic_message (dc) = _(msgid);
diagnostic_argument_list (dc) = args_ptr; diagnostic_argument_list (dc) = args_ptr;
diagnostic_file_location (dc) = file; diagnostic_file_location (dc) = file;
diagnostic_line_location (dc) = line; diagnostic_line_location (dc) = line;