gcc/po/ * exgettext: Handle gmsgid and cmsgid arguments specially, as gcc-internal-format and c-format. Because of xgettext bug, invoke xgettext once with --language=c, once with --language=GCC-source and then merge together. Fail if xgettext is not 0.14.5 or later. gcc/ * intl.h (G_): New macro. * rtl-error.c (error_for_asm, warning_for_asm): Use gmsgid instead of msgid for argument name. * tree-ssa.c (warn_uninit): Likewise. * c-parser.c (c_parser_error): Likewise. * config/rs6000/rs6000-c.c (SYNTAX_ERROR): Likewise. * config/darwin-c.c (BAD): Likewise. * config/c4x/c4x-c.c (BAD): Likewise. * c-pragma.c (GCC_BAD, GCC_BAD2): Likewise. * c-errors.c (pedwarn_c99, pedwarn_c90): Likewise. * c-common.c (c_parse_error): Likewise. * diagnostic.c (diagnostic_set_info, verbatim, inform, warning, warning0, pedwarn, error, sorry, fatal_error, internal_error): Likewise. (fnotice): Use cmsgid instead of msgid for argument name. * gcov.c (fnotice): Likewise. * protoize.c (notice): Likewise. * final.c (output_operand_lossage): Likewise. * gcc.c (fatal, notice): Likewise. (error): Use gmsgid instead of msgid for argument name. * collect2.c (notice, fatal_perror, fatal): Use cmsgid instead of msgid for argument name. (error): Use gmsgid instead of msgid for argument name. * c-decl.c (locate_old_decl, implicit_decl_warning): Use G_() instead of N_(). * c-typeck.c (readonly_error, convert_for_assignment): Likewise. * tree-inline.c (inline_forbidden_p_1): Likewise. * ABOUT-GCC-NLS: Require gettext 0.14.5 or later. Mention the new conventions for marking translations. * doc/install.texi: Mention gettext 0.14.5 or later requirement. gcc/cp/ * error.c (locate_error): Use gmsgid instead of msgid for argument name. (cp_error_at, cp_warning_at, cp_pedwarn_at): Likewise. gcc/java/ * jv-scan.c (fatal_error, warning, warning0): Use gmsgid instead of msgid for argument name. * gjavah.c (error): Likewise. * java-tree.h (parse_error_context): Likewise. * parse.y (parse_error_context, parse_warning_context, issue_warning_error_from_context): Likewise. From-SVN: r100676
64 lines
1.9 KiB
C
64 lines
1.9 KiB
C
/* Various diagnostic subroutines for the GNU C language.
|
|
Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
|
|
Contributed by Gabriel Dos Reis <gdr@codesourcery.com>
|
|
|
|
This file is part of GCC.
|
|
|
|
GCC is free software; you can redistribute it and/or modify it under
|
|
the terms of the GNU General Public License as published by the Free
|
|
Software Foundation; either version 2, or (at your option) any later
|
|
version.
|
|
|
|
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 GCC; see the file COPYING. If not, write to the Free
|
|
Software Foundation, 59 Temple Place - Suite 330, Boston, MA
|
|
02111-1307, USA. */
|
|
|
|
#include "config.h"
|
|
#include "system.h"
|
|
#include "coretypes.h"
|
|
#include "tm.h"
|
|
#include "tree.h"
|
|
#include "c-tree.h"
|
|
#include "tm_p.h"
|
|
#include "flags.h"
|
|
#include "diagnostic.h"
|
|
|
|
/* Issue an ISO C99 pedantic warning MSGID. */
|
|
|
|
void
|
|
pedwarn_c99 (const char *gmsgid, ...)
|
|
{
|
|
diagnostic_info diagnostic;
|
|
va_list ap;
|
|
|
|
va_start (ap, gmsgid);
|
|
diagnostic_set_info (&diagnostic, gmsgid, &ap, input_location,
|
|
flag_isoc99 ? pedantic_error_kind () : DK_WARNING);
|
|
report_diagnostic (&diagnostic);
|
|
va_end (ap);
|
|
}
|
|
|
|
/* Issue an ISO C90 pedantic warning MSGID. This function is supposed to
|
|
be used for matters that are allowed in ISO C99 but not supported in
|
|
ISO C90, thus we explicitly don't pedwarn when C99 is specified.
|
|
(There is no flag_c90.) */
|
|
|
|
void
|
|
pedwarn_c90 (const char *gmsgid, ...)
|
|
{
|
|
diagnostic_info diagnostic;
|
|
va_list ap;
|
|
|
|
va_start (ap, gmsgid);
|
|
diagnostic_set_info (&diagnostic, gmsgid, &ap, input_location,
|
|
flag_isoc99 ? DK_WARNING : pedantic_error_kind ());
|
|
report_diagnostic (&diagnostic);
|
|
va_end (ap);
|
|
}
|