This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Patch to change %` %' to %< %>
- From: "Joseph S. Myers" <jsm at polyomino dot org dot uk>
- To: gcc-patches at gcc dot gnu dot org
- Date: Sat, 29 May 2004 18:36:44 +0000 (UTC)
- Subject: Patch to change %` %' to %< %>
As requested here is a patch to change the %` and %' formats to %< and
%>. %' is retained for use in those messages with apostrophes that
aren't part of matched quotes; it should only appear in untranslated
messages, whereas %< and %> may or may not appear in translations of
messages that use them.
Bootstrapped with no regressions on i686-pc-linux-gnu. OK to commit?
2004-05-29 Joseph S. Myers <jsm@polyomino.org.uk>
* pretty-print.c (pp_base_format_text): Support %< instead of %`
and %> as well as %'.
* c-format.c: Use %< and %>.
(gcc_diag_char_table, gcc_cdiag_char_table,
gcc_cxxdiag_char_table): Update.
diff -rupN gcc.orig/c-format.c gcc/c-format.c
--- gcc.orig/c-format.c 2004-05-24 19:25:41.000000000 +0000
+++ gcc/c-format.c 2004-05-29 14:03:30.000000000 +0000
@@ -815,8 +815,7 @@ static const format_char_info gcc_diag_c
/* These will require a "tree" at runtime. */
{ "J", 0, STD_C89, { T89_V, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "q", "" },
- { "`", 0, STD_C89, NOARGUMENTS, "", "" },
- { "'", 0, STD_C89, NOARGUMENTS, "", "" },
+ { "<>'", 0, STD_C89, NOARGUMENTS, "", "" },
{ "m", 0, STD_C89, NOARGUMENTS, "q", "" },
{ NULL, 0, 0, NOLENGTHS, NULL, NULL }
};
@@ -839,8 +838,7 @@ static const format_char_info gcc_cdiag_
/* These will require a "tree" at runtime. */
{ "DEFJT", 0, STD_C89, { T89_V, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "q", "" },
- { "`", 0, STD_C89, NOARGUMENTS, "", "" },
- { "'", 0, STD_C89, NOARGUMENTS, "", "" },
+ { "<>'", 0, STD_C89, NOARGUMENTS, "", "" },
{ "m", 0, STD_C89, NOARGUMENTS, "q", "" },
{ NULL, 0, 0, NOLENGTHS, NULL, NULL }
};
@@ -866,8 +864,7 @@ static const format_char_info gcc_cxxdia
/* These accept either an `int' or an `enum tree_code' (which is handled as an `int'.) */
{ "CLOPQ",0,STD_C89, { T89_I, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "q", "" },
- { "`", 0, STD_C89, NOARGUMENTS, "", "" },
- { "'", 0, STD_C89, NOARGUMENTS, "", "" },
+ { "<>'", 0, STD_C89, NOARGUMENTS, "", "" },
{ "m", 0, STD_C89, NOARGUMENTS, "q", "" },
{ NULL, 0, 0, NOLENGTHS, NULL, NULL }
};
@@ -1707,7 +1704,7 @@ check_format_info_main (int *status, for
if (*format_chars == 0)
{
if (format_chars - orig_format_chars != format_length)
- status_warning (status, "embedded %`\\0%' in format");
+ status_warning (status, "embedded %<\\0%> in format");
if (info->first_arg_num != 0 && params != 0
&& has_operand_number <= 0)
{
@@ -1722,7 +1719,7 @@ check_format_info_main (int *status, for
continue;
if (*format_chars == 0)
{
- status_warning (status, "spurious trailing %`%%%' in format");
+ status_warning (status, "spurious trailing %<%%%> in format");
continue;
}
if (*format_chars == '%')
@@ -2068,7 +2065,7 @@ check_format_info_main (int *status, for
if (pedantic)
{
if (ADJ_STD (fci->std) > C_STD_VER)
- status_warning (status, "%s does not support the %`%%%c%' %s format",
+ status_warning (status, "%s does not support the %<%%%c%> %s format",
C_STD_NAME (fci->std), format_char, fki->name);
}
@@ -2084,7 +2081,7 @@ check_format_info_main (int *status, for
continue;
if (strchr (fci->flag_chars, flag_chars[i]) == 0)
{
- status_warning (status, "%s used with %`%%%c%' %s format",
+ status_warning (status, "%s used with %<%%%c%> %s format",
_(s->name), format_char, fki->name);
d++;
continue;
@@ -2102,7 +2099,7 @@ check_format_info_main (int *status, for
? t->long_name
: s->long_name);
if (ADJ_STD (t->std) > C_STD_VER)
- status_warning (status, "%s does not support %s with the %`%%%c%' %s format",
+ status_warning (status, "%s does not support %s with the %<%%%c%> %s format",
C_STD_NAME (t->std), _(long_name),
format_char, fki->name);
}
@@ -2135,7 +2132,7 @@ check_format_info_main (int *status, for
if (bad_flag_pairs[i].ignored)
{
if (bad_flag_pairs[i].predicate != 0)
- status_warning (status, "%s ignored with %s and %`%%%c%' %s format",
+ status_warning (status, "%s ignored with %s and %<%%%c%> %s format",
_(s->name), _(t->name), format_char,
fki->name);
else
@@ -2145,7 +2142,7 @@ check_format_info_main (int *status, for
else
{
if (bad_flag_pairs[i].predicate != 0)
- status_warning (status, "use of %s and %s together with %`%%%c%' %s format",
+ status_warning (status, "use of %s and %s together with %<%%%c%> %s format",
_(s->name), _(t->name), format_char,
fki->name);
else
@@ -2168,10 +2165,10 @@ check_format_info_main (int *status, for
else if (strchr (fci->flags2, '2') != 0)
y2k_level = 2;
if (y2k_level == 3)
- status_warning (status, "%`%%%c%' yields only last 2 digits of year in some locales",
+ status_warning (status, "%<%%%c%> yields only last 2 digits of year in some locales",
format_char);
else if (y2k_level == 2)
- status_warning (status, "%`%%%c%' yields only last 2 digits of year", format_char);
+ status_warning (status, "%<%%%c%> yields only last 2 digits of year", format_char);
}
if (strchr (fci->flags2, '[') != 0)
@@ -2187,7 +2184,7 @@ check_format_info_main (int *status, for
++format_chars;
if (*format_chars != ']')
/* The end of the format string was reached. */
- status_warning (status, "no closing %`]%' for %`%%[%' format");
+ status_warning (status, "no closing %<]%> for %<%%[%> format");
}
wanted_type = 0;
@@ -2221,7 +2218,7 @@ check_format_info_main (int *status, for
&& ADJ_STD (wanted_type_std) > ADJ_STD (fci->std))
{
if (ADJ_STD (wanted_type_std) > C_STD_VER)
- status_warning (status, "%s does not support the %`%%%s%c%' %s format",
+ status_warning (status, "%s does not support the %<%%%s%c%> %s format",
C_STD_NAME (wanted_type_std), length_chars,
format_char, fki->name);
}
diff -rupN gcc.orig/pretty-print.c gcc/pretty-print.c
--- gcc.orig/pretty-print.c 2004-05-24 19:25:41.000000000 +0000
+++ gcc/pretty-print.c 2004-05-29 14:00:21.000000000 +0000
@@ -179,8 +179,10 @@ pp_base_indent (pretty_printer *pp)
%p: pointer.
%m: strerror(text->err_no) - does not consume a value from args_ptr.
%%: '%'.
- %`: opening quote.
- %': closing quote.
+ %<: opening quote.
+ %>: closing quote.
+ %': apostrophe (synonym of %>, but should only be used in untranslated
+ messages).
%.*s: a substring the length of which is specified by an integer.
%H: location_t.
Flag 'q': quote formatted text (must come immediately after '%'). */
@@ -292,10 +294,11 @@ pp_base_format_text (pretty_printer *pp,
pp_character (pp, '%');
break;
- case '`':
+ case '<':
pp_string (pp, open_quote);
break;
+ case '>':
case '\'':
pp_string (pp, close_quote);
break;
--
Joseph S. Myers
jsm@polyomino.org.uk