2001-10-19 17:17:39 +02:00
|
|
|
/* Message translation utilities.
|
hooks.c, [...]: Update copyright.
* hooks.c, hooks.h, intl.c, opts.h, prefix.c, tree-gimple.c,
config/alpha/ev4.md, config/alpha/ev5.md, config/alpha/ev6.md,
config/alpha/freebsd.h, config/alpha/linux.h,
config/alpha/netbsd.h, config/alpha/osf5.h,
config/alpha/vms.h, config/arc/arc.c, config/arc/arc.h,
config/h8300/h8300-protos.h, config/h8300/h8300.c,
config/h8300/h8300.h, config/ia64/unwind-ia64.c,
doc/cppopts.texi: Update copyright.
From-SVN: r96686
2005-03-18 16:24:28 +01:00
|
|
|
Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
|
1998-08-02 08:46:46 +02:00
|
|
|
|
2001-10-19 17:17:39 +02:00
|
|
|
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
|
2005-06-25 04:02:01 +02:00
|
|
|
Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
|
|
|
|
02110-1301, USA. */
|
2001-10-19 17:17:39 +02:00
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
#include "system.h"
|
2002-12-16 19:23:00 +01:00
|
|
|
#include "coretypes.h"
|
|
|
|
#include "tm.h"
|
1998-08-02 08:46:46 +02:00
|
|
|
#include "intl.h"
|
|
|
|
|
intl.h (open_quote, [...]): New.
* intl.h (open_quote, close_quote): New.
* intl.c (open_quote, close_quote): New.
(gcc_init_libintl): Set them.
* pretty-print.c: Include "intl.h".
(pp_base_format_text): Support 'q' format flag and %` and %'
formats. Use ' instead of ` in comments.
* c-format.c (gcc_diag_flag_specs, gcc_cxxdiag_flag_specs,
gcc_diag_char_table, gcc_cdiag_char_table, gcc_cxxdiag_char_table,
foramt_types_orig): Describe these new formats.
(decode_format_attr, check_function_format,
check_format_info_main): Use these new formats.
(status_warning): Use ATTRIBUTE_GCC_DIAG.
* toplev.c (ATTRIBUTE_GCC_DIAG): Increase required GCC version to
check these formats to 3.5.
From-SVN: r82215
2004-05-24 21:28:20 +02:00
|
|
|
#ifdef HAVE_LANGINFO_CODESET
|
|
|
|
#include <langinfo.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Opening quotation mark for diagnostics. */
|
|
|
|
const char *open_quote = "'";
|
|
|
|
|
|
|
|
/* Closing quotation mark for diagnostics. */
|
|
|
|
const char *close_quote = "'";
|
|
|
|
|
2001-10-19 17:17:39 +02:00
|
|
|
#ifdef ENABLE_NLS
|
|
|
|
|
|
|
|
/* Initialize the translation library for GCC. This performs the
|
|
|
|
appropriate sequence of calls - setlocale, bindtextdomain,
|
|
|
|
textdomain. LC_CTYPE determines the character set used by the
|
|
|
|
terminal, so it has be set to output messages correctly. */
|
|
|
|
|
|
|
|
void
|
2003-06-01 17:59:10 +02:00
|
|
|
gcc_init_libintl (void)
|
2001-10-19 17:17:39 +02:00
|
|
|
{
|
|
|
|
#ifdef HAVE_LC_MESSAGES
|
|
|
|
setlocale (LC_CTYPE, "");
|
|
|
|
setlocale (LC_MESSAGES, "");
|
|
|
|
#else
|
|
|
|
setlocale (LC_ALL, "");
|
|
|
|
#endif
|
|
|
|
|
gcc-version.m4: Delete.
config:
* gcc-version.m4: Delete.
fastjar:
* Makefile.am (fastjar_TEXINFOS): Add gcc-vers.texi.
(BASEVER, DEVPHASE): New variables.
(POD2MAN): Adjust setting of --release option.
(fastjar.1, grepjar.1, gcc-vers.texi): New rules.
* Makefile.in: Regenerate.
* configure.ac: Do not invoke TL_AC_GCC_VERSION.
* aclocal.m4, configure: Regenerate.
gcc:
* BASE-VER, DATESTAMP, DEV-PHASE: New files.
* Makefile.in (gcc_version, gcc_version_trigger, ): Delete.
(BASEVER, DEVPHASE, DATESTAMP, BASEVER_c, DEVPHASE_c, DATESTAMP_c)
(BASEVER_s, DEVPHASE_s, DATESTAMP_s): New variables.
(version): Define using $(BASEVER_c).
(Makefile, config.status, build/gcov-iov.o): No longer depends on
version.c.
(version.o): Depend on version files; add custom generation command.
(prefix.o): Define BASEVER on command line.
(s-iov): Depend on version files; adjust command.
(TEXI_CPP_FILES, TEX_IGCC_FILES, TEXI_GCCINT_FILES, TEXI_CPPINT_FILES):
Add gcc-vers.texi.
(gcc-vers.texi): New rule.
(doc/%.info, doc/%.dvi): Add -I . to command line.
(doc/gccinstall.dvi): Likewise.
(PACKAGE): Delete. All uses replaced with "gcc".
* aclocal.m4: Do not include gcc-version.m4.
* configure.ac: Do not invoke TL_AC_GCC_VERSION.
Do not AC_SUBST nor AC_DEFINE PACKAGE or VERSION.
Set is_release based on contents of DEV-PHASE.
Set gcc_version based on contents of BASE-VER.
Define WIN32_REGISTRY_KEY only if the user overrode the default.
* config.in, configure: Regenerate.
* gccbug.in: Determine version of GCC in use at runtime.
* gcov-iov.c: Get version number and development phase from
command line, not by including version.c.
* intl.c: Replace all uses of PACKAGE with "gcc".
* libada-mk.in: Delete unused "gcc_version" variable.
* prefix.c: Default WIN32_REGISTRY_KEY to BASEVER.
* version.c: (VERSUFFIX): New hook for redistributors; adjust
commentary to match.
(version_string): Put together from pieces.
* config/alpha/x-vms: Do not use $(gcc_version).
* config/i386/t-nwld: Likewise.
* doc/include/gcc-common.texi: Include gcc-vers.texi for
version-GCC and DEVELOPMENT.
gcc/ada:
* Make-lang.in (doc/gnat_ugn_unw.info, doc/gnat_rm.info)
(doc/gnat_ugn_unw.dvi, doc/gnat_rm.dvi): Add gcc-vers.texi
to dependencies.
gcc/fortran:
* Make-lang.in (GFORTRAN_TEXI): Add gcc-vers.texi.
gcc/java:
* Make-lang.in (TEXI_JAVA_FILES): Add gcc-vers.texi.
gcc/treelang:
* Make-lang.in (TEXI_TREELANG_FILES): Add gcc-vers.texi.
libstdc++-v3:
* include/Makefile.am (c++config.h): Depend on DATESTAMP from gcc
subdirectory. Generate #define of __GLIBCXX__ from contents of
that file.
* include/Makefile.in: Regenerate.
* include/bits/c++config: Do not define __GLIBCXX__.
maintainer-scripts:
* README: Update.
* gcc_release: Update gcc/DEV-PHASE if that file exists, instead
of gcc/version.c.
* update_version: Handle updating gcc/DATESTAMP.
* update_web_docs: Generate gcc-vers.texi first.
From-SVN: r96549
2005-03-16 07:04:10 +01:00
|
|
|
(void) bindtextdomain ("gcc", LOCALEDIR);
|
|
|
|
(void) textdomain ("gcc");
|
intl.h (open_quote, [...]): New.
* intl.h (open_quote, close_quote): New.
* intl.c (open_quote, close_quote): New.
(gcc_init_libintl): Set them.
* pretty-print.c: Include "intl.h".
(pp_base_format_text): Support 'q' format flag and %` and %'
formats. Use ' instead of ` in comments.
* c-format.c (gcc_diag_flag_specs, gcc_cxxdiag_flag_specs,
gcc_diag_char_table, gcc_cdiag_char_table, gcc_cxxdiag_char_table,
foramt_types_orig): Describe these new formats.
(decode_format_attr, check_function_format,
check_format_info_main): Use these new formats.
(status_warning): Use ATTRIBUTE_GCC_DIAG.
* toplev.c (ATTRIBUTE_GCC_DIAG): Increase required GCC version to
check these formats to 3.5.
From-SVN: r82215
2004-05-24 21:28:20 +02:00
|
|
|
|
|
|
|
/* Opening quotation mark. */
|
|
|
|
open_quote = _("`");
|
|
|
|
|
|
|
|
/* Closing quotation mark. */
|
|
|
|
close_quote = _("'");
|
|
|
|
|
|
|
|
if (!strcmp (open_quote, "`") && !strcmp (close_quote, "'"))
|
|
|
|
{
|
|
|
|
#if defined HAVE_LANGINFO_CODESET
|
|
|
|
const char *encoding;
|
|
|
|
#endif
|
|
|
|
/* Untranslated quotes that it may be possible to replace with
|
|
|
|
U+2018 and U+2019; but otherwise use "'" instead of "`" as
|
|
|
|
opening quote. */
|
|
|
|
open_quote = "'";
|
|
|
|
#if defined HAVE_LANGINFO_CODESET
|
|
|
|
encoding = nl_langinfo (CODESET);
|
|
|
|
if (encoding != NULL
|
|
|
|
&& (!strcasecmp (encoding, "utf-8")
|
|
|
|
|| !strcasecmp (encoding, "utf8")))
|
|
|
|
{
|
|
|
|
open_quote = "\xe2\x80\x98";
|
|
|
|
close_quote = "\xe2\x80\x99";
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
2001-10-19 17:17:39 +02:00
|
|
|
}
|
|
|
|
|
2003-04-24 20:35:45 +02:00
|
|
|
#if defined HAVE_WCHAR_H && defined HAVE_WORKING_MBSTOWCS && defined HAVE_WCSWIDTH
|
2003-04-12 20:07:06 +02:00
|
|
|
#include <wchar.h>
|
|
|
|
|
|
|
|
/* Returns the width in columns of MSGSTR, which came from gettext.
|
|
|
|
This is for indenting subsequent output. */
|
|
|
|
|
|
|
|
size_t
|
2003-06-01 17:59:10 +02:00
|
|
|
gcc_gettext_width (const char *msgstr)
|
2003-04-12 20:07:06 +02:00
|
|
|
{
|
|
|
|
size_t nwcs = mbstowcs (0, msgstr, 0);
|
|
|
|
wchar_t *wmsgstr = alloca ((nwcs + 1) * sizeof (wchar_t));
|
|
|
|
|
|
|
|
mbstowcs (wmsgstr, msgstr, nwcs + 1);
|
|
|
|
return wcswidth (wmsgstr, nwcs);
|
|
|
|
}
|
|
|
|
|
|
|
|
#else /* no wcswidth */
|
|
|
|
|
|
|
|
/* We don't have any way of knowing how wide the string is. Guess
|
|
|
|
the length of the string. */
|
|
|
|
|
|
|
|
size_t
|
2003-06-01 17:59:10 +02:00
|
|
|
gcc_gettext_width (const char *msgstr)
|
2003-04-12 20:07:06 +02:00
|
|
|
{
|
|
|
|
return strlen (msgstr);
|
|
|
|
}
|
|
|
|
|
2001-10-19 17:17:39 +02:00
|
|
|
#endif
|
2003-04-12 20:07:06 +02:00
|
|
|
|
|
|
|
#endif /* ENABLE_NLS */
|