Daily bump.

[pf3gnuchains/gcc-fork.git] / gcc / intl.c

diff --git a/gcc/intl.c b/gcc/intl.c
index 5a885bf..c13ab8e 100644 (file)
--- a/gcc/intl.c
+++ b/gcc/intl.c
@@ -1,11 +1,12 @@
 /* Message translation utilities.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003, 2004, 2005, 2007, 2008, 2009, 2010
+   Free Software Foundation, Inc.
 
 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
+Software Foundation; either version 3, or (at your option) any later
 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY
@@ -14,16 +15,30 @@ 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.  */
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */
 
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
 #include "intl.h"
 
+#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 = "'";
+
+/* The name of the locale encoding.  */
+const char *locale_encoding = NULL;
+
+/* Whether the locale is using UTF-8.  */
+bool locale_utf8 = false;
+
 #ifdef ENABLE_NLS
 
 /* Initialize the translation library for GCC.  This performs the
@@ -32,7 +47,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
    terminal, so it has be set to output messages correctly.  */
 
 void
-gcc_init_libintl ()
+gcc_init_libintl (void)
 {
 #ifdef HAVE_LC_MESSAGES
   setlocale (LC_CTYPE, "");
@@ -43,20 +58,48 @@ gcc_init_libintl ()
 
   (void) bindtextdomain ("gcc", LOCALEDIR);
   (void) textdomain ("gcc");
+
+  /* Opening quotation mark.  */
+  open_quote = _("`");
+
+  /* Closing quotation mark.  */
+  close_quote = _("'");
+
+#if defined HAVE_LANGINFO_CODESET
+  locale_encoding = nl_langinfo (CODESET);
+  if (locale_encoding != NULL
+      && (!strcasecmp (locale_encoding, "utf-8")
+         || !strcasecmp (locale_encoding, "utf8")))
+    locale_utf8 = true;
+#endif
+
+  if (!strcmp (open_quote, "`") && !strcmp (close_quote, "'"))
+    {
+      /* 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
+      if (locale_utf8)
+       {
+         open_quote = "\xe2\x80\x98";
+         close_quote = "\xe2\x80\x99";
+       }
+#endif
+    }
 }
 
-#if defined HAVE_WCHAR_H && defined HAVE_MBSTOWCS && defined HAVE_WCSWIDTH
+#if defined HAVE_WCHAR_H && defined HAVE_WORKING_MBSTOWCS && defined HAVE_WCSWIDTH
 #include <wchar.h>
 
 /* Returns the width in columns of MSGSTR, which came from gettext.
    This is for indenting subsequent output.  */
 
 size_t
-gcc_gettext_width (msgstr)
-     const char *msgstr;
+gcc_gettext_width (const char *msgstr)
 {
   size_t nwcs = mbstowcs (0, msgstr, 0);
-  wchar_t *wmsgstr = alloca ((nwcs + 1) * sizeof (wchar_t));
+  wchar_t *wmsgstr = XALLOCAVEC (wchar_t, nwcs + 1);
 
   mbstowcs (wmsgstr, msgstr, nwcs + 1);
   return wcswidth (wmsgstr, nwcs);
@@ -68,8 +111,7 @@ gcc_gettext_width (msgstr)
    the length of the string.  */
 
 size_t
-gcc_gettext_width (msgstr)
-     const char *msgstr;
+gcc_gettext_width (const char *msgstr)
 {
   return strlen (msgstr);
 }
@@ -77,3 +119,33 @@ gcc_gettext_width (msgstr)
 #endif
 
 #endif /* ENABLE_NLS */
+
+#ifndef ENABLE_NLS
+
+const char *
+fake_ngettext (const char *singular, const char *plural, unsigned long n)
+{
+  if (n == 1UL)
+    return singular;
+
+  return plural;
+}
+
+#endif
+
+/* Return the indent for successive lines, using the width of
+   the STR.  STR must have been translated already.  The string
+   must be freed by the caller.  */
+
+char *
+get_spaces (const char *str)
+{
+   size_t len = gcc_gettext_width (str);
+   char *spaces = XNEWVEC(char, len + 1);
+   memset (spaces, ' ', len);
+   spaces[len] = '\0';
+   return spaces;
+}
+
+
+