2009-07-31 Andrew Haley <aph@redhat.com>

[pf3gnuchains/gcc-fork.git] / gcc / c-pretty-print.c

diff --git a/gcc/c-pretty-print.c b/gcc/c-pretty-print.c
index efd15ac..f9694bf 100644 (file)
--- a/gcc/c-pretty-print.c
+++ b/gcc/c-pretty-print.c
@@ -31,6 +31,10 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-iterator.h"
 #include "diagnostic.h"
 
+/* Translate if being used for diagnostics, but not for dump files or
+   __PRETTY_FUNCTION.  */
+#define M_(msgid) (pp_translate_identifiers (pp) ? _(msgid) : (msgid))
+
 /* The pretty-printer code is primarily designed to closely follow
    (GNU) C and C++ grammars.  That is to be contrasted with spaghetti
    codes we used to have in the past.  Following a structured
@@ -307,7 +311,7 @@ pp_c_type_specifier (c_pretty_printer *pp, tree t)
   switch (code)
     {
     case ERROR_MARK:
-      pp_c_ws_string (pp, _("<type-error>"));
+      pp_c_ws_string (pp, M_("<type-error>"));
       break;
 
     case IDENTIFIER_NODE:
@@ -346,14 +350,14 @@ pp_c_type_specifier (c_pretty_printer *pp, tree t)
                {
                case INTEGER_TYPE:
                  pp_string (pp, (TYPE_UNSIGNED (t)
-                                 ? _("<unnamed-unsigned:")
-                                 : _("<unnamed-signed:")));
+                                 ? M_("<unnamed-unsigned:")
+                                 : M_("<unnamed-signed:")));
                  break;
                case REAL_TYPE:
-                 pp_string (pp, _("<unnamed-float:"));
+                 pp_string (pp, M_("<unnamed-float:"));
                  break;
                case FIXED_POINT_TYPE:
-                 pp_string (pp, _("<unnamed-fixed:"));
+                 pp_string (pp, M_("<unnamed-fixed:"));
                  break;
                default:
                  gcc_unreachable ();
@@ -368,7 +372,7 @@ pp_c_type_specifier (c_pretty_printer *pp, tree t)
       if (DECL_NAME (t))
        pp_id_expression (pp, t);
       else
-       pp_c_ws_string (pp, _("<typedef-error>"));
+       pp_c_ws_string (pp, M_("<typedef-error>"));
       break;
 
     case UNION_TYPE:
@@ -381,12 +385,12 @@ pp_c_type_specifier (c_pretty_printer *pp, tree t)
       else if (code == ENUMERAL_TYPE)
        pp_c_ws_string (pp, "enum");
       else
-       pp_c_ws_string (pp, _("<tag-error>"));
+       pp_c_ws_string (pp, M_("<tag-error>"));
 
       if (TYPE_NAME (t))
        pp_id_expression (pp, TYPE_NAME (t));
       else
-       pp_c_ws_string (pp, _("<anonymous>"));
+       pp_c_ws_string (pp, M_("<anonymous>"));
       break;
 
     default:
@@ -1119,11 +1123,11 @@ pp_c_primary_expression (c_pretty_printer *pp, tree e)
       break;
 
     case ERROR_MARK:
-      pp_c_ws_string (pp, _("<erroneous-expression>"));
+      pp_c_ws_string (pp, M_("<erroneous-expression>"));
       break;
 
     case RESULT_DECL:
-      pp_c_ws_string (pp, _("<return-value>"));
+      pp_c_ws_string (pp, M_("<return-value>"));
       break;
 
     case INTEGER_CST: