* 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.
From-SVN: r82428
+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.
+
2004-05-29 Joseph S. Myers <jsm@polyomino.org.uk>
* c-typeck.c (common_type): Correct comment.
2004-05-29 Joseph S. Myers <jsm@polyomino.org.uk>
* c-typeck.c (common_type): Correct comment.
/* These will require a "tree" at runtime. */
{ "J", 0, STD_C89, { T89_V, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "q", "" },
/* 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 }
};
{ "m", 0, STD_C89, NOARGUMENTS, "q", "" },
{ NULL, 0, 0, NOLENGTHS, NULL, NULL }
};
/* These will require a "tree" at runtime. */
{ "DEFJT", 0, STD_C89, { T89_V, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "q", "" },
/* 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 }
};
{ "m", 0, STD_C89, NOARGUMENTS, "q", "" },
{ NULL, 0, 0, NOLENGTHS, NULL, NULL }
};
/* 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", "" },
/* 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 }
};
{ "m", 0, STD_C89, NOARGUMENTS, "q", "" },
{ NULL, 0, 0, NOLENGTHS, NULL, NULL }
};
if (*format_chars == 0)
{
if (format_chars - orig_format_chars != format_length)
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)
{
if (info->first_arg_num != 0 && params != 0
&& has_operand_number <= 0)
{
continue;
if (*format_chars == 0)
{
continue;
if (*format_chars == 0)
{
- status_warning (status, "spurious trailing %`%%%' in format");
+ status_warning (status, "spurious trailing %<%%%> in format");
continue;
}
if (*format_chars == '%')
continue;
}
if (*format_chars == '%')
if (pedantic)
{
if (ADJ_STD (fci->std) > C_STD_VER)
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);
}
C_STD_NAME (fci->std), format_char, fki->name);
}
continue;
if (strchr (fci->flag_chars, flag_chars[i]) == 0)
{
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;
_(s->name), format_char, fki->name);
d++;
continue;
? t->long_name
: s->long_name);
if (ADJ_STD (t->std) > C_STD_VER)
? 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);
}
C_STD_NAME (t->std), _(long_name),
format_char, fki->name);
}
if (bad_flag_pairs[i].ignored)
{
if (bad_flag_pairs[i].predicate != 0)
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
_(s->name), _(t->name), format_char,
fki->name);
else
else
{
if (bad_flag_pairs[i].predicate != 0)
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
_(s->name), _(t->name), format_char,
fki->name);
else
else if (strchr (fci->flags2, '2') != 0)
y2k_level = 2;
if (y2k_level == 3)
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)
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)
}
if (strchr (fci->flags2, '[') != 0)
++format_chars;
if (*format_chars != ']')
/* The end of the format string was reached. */
++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");
&& ADJ_STD (wanted_type_std) > ADJ_STD (fci->std))
{
if (ADJ_STD (wanted_type_std) > C_STD_VER)
&& 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);
}
C_STD_NAME (wanted_type_std), length_chars,
format_char, fki->name);
}
%p: pointer.
%m: strerror(text->err_no) - does not consume a value from args_ptr.
%%: '%'.
%p: pointer.
%m: strerror(text->err_no) - does not consume a value from args_ptr.
%%: '%'.
- %`: opening quote.
- %': closing quote.
+ %<: opening quote.
+ %>: closing quote.
+ %': apostrophe (should only be used in untranslated messages;
+ translations should use appropriate punctuation directly).
%.*s: a substring the length of which is specified by an integer.
%H: location_t.
Flag 'q': quote formatted text (must come immediately after '%'). */
%.*s: a substring the length of which is specified by an integer.
%H: location_t.
Flag 'q': quote formatted text (must come immediately after '%'). */
pp_character (pp, '%');
break;
pp_character (pp, '%');
break;
pp_string (pp, open_quote);
break;
pp_string (pp, open_quote);
break;
case '\'':
pp_string (pp, close_quote);
break;
case '\'':
pp_string (pp, close_quote);
break;