OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pretty-print.c (pp_base_format_text): Support %< instead of %` and %> as well as %'.

Browse Source 
* 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
This commit is contained in:
Joseph Myers 2004-05-29 21:10:10 +01:00 committed by Joseph Myers
parent 9e953fed92
commit ca09cd34f1
3 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/ChangeLog
View File

@ -1,3 +1,11 @@
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> 2004-05-29 Joseph S. Myers <jsm@polyomino.org.uk>
* c-typeck.c (common_type): Correct comment. * c-typeck.c (common_type): Correct comment.

31
gcc/c-format.c
View File

@ -815,8 +815,7 @@ static const format_char_info gcc_diag_char_table[] =
/* These will require a "tree" at runtime. */ /* These will require a "tree" at runtime. */
{ "J", 0, STD_C89, { T89_V, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "q", "" }, { "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", "" }, { "m", 0, STD_C89, NOARGUMENTS, "q", "" },
{ NULL, 0, 0, NOLENGTHS, NULL, NULL } { NULL, 0, 0, NOLENGTHS, NULL, NULL }
}; };
@ -839,8 +838,7 @@ static const format_char_info gcc_cdiag_char_table[] =
/* These will require a "tree" at runtime. */ /* These will require a "tree" at runtime. */
{ "DEFJT", 0, STD_C89, { T89_V, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "q", "" }, { "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", "" }, { "m", 0, STD_C89, NOARGUMENTS, "q", "" },
{ NULL, 0, 0, NOLENGTHS, NULL, NULL } { NULL, 0, 0, NOLENGTHS, NULL, NULL }
}; };
@ -866,8 +864,7 @@ static const format_char_info gcc_cxxdiag_char_table[] =
/* These accept either an `int' or an `enum tree_code' (which is handled as an `int'.) */ /* 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", "" }, { "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", "" }, { "m", 0, STD_C89, NOARGUMENTS, "q", "" },
{ NULL, 0, 0, NOLENGTHS, NULL, NULL } { NULL, 0, 0, NOLENGTHS, NULL, NULL }
}; };
@ -1707,7 +1704,7 @@ check_format_info_main (int *status, format_check_results *res,
if (*format_chars == 0) if (*format_chars == 0)
{ {
if (format_chars - orig_format_chars != format_length) 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 if (info->first_arg_num != 0 && params != 0
&& has_operand_number <= 0) && has_operand_number <= 0)
{ {
@ -1722,7 +1719,7 @@ check_format_info_main (int *status, format_check_results *res,
continue; continue;
if (*format_chars == 0) if (*format_chars == 0)
{ {
status_warning (status, "spurious trailing %`%%%' in format"); status_warning (status, "spurious trailing %<%%%> in format");
continue; continue;
} }
if (*format_chars == '%') if (*format_chars == '%')
@ -2068,7 +2065,7 @@ check_format_info_main (int *status, format_check_results *res,
if (pedantic) if (pedantic)
{ {
if (ADJ_STD (fci->std) > C_STD_VER) 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);
} }
@ -2084,7 +2081,7 @@ check_format_info_main (int *status, format_check_results *res,
continue; continue;
if (strchr (fci->flag_chars, flag_chars[i]) == 0) 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); _(s->name), format_char, fki->name);
d++; d++;
continue; continue;
@ -2102,7 +2099,7 @@ check_format_info_main (int *status, format_check_results *res,
? t->long_name ? t->long_name
: s->long_name); : s->long_name);
if (ADJ_STD (t->std) > C_STD_VER) 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), C_STD_NAME (t->std), _(long_name),
format_char, fki->name); format_char, fki->name);
} }
@ -2135,7 +2132,7 @@ check_format_info_main (int *status, format_check_results *res,
if (bad_flag_pairs[i].ignored) if (bad_flag_pairs[i].ignored)
{ {
if (bad_flag_pairs[i].predicate != 0) 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, _(s->name), _(t->name), format_char,
fki->name); fki->name);
else else
@ -2145,7 +2142,7 @@ check_format_info_main (int *status, format_check_results *res,
else else
{ {
if (bad_flag_pairs[i].predicate != 0) 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, _(s->name), _(t->name), format_char,
fki->name); fki->name);
else else
@ -2168,10 +2165,10 @@ check_format_info_main (int *status, format_check_results *res,
else if (strchr (fci->flags2, '2') != 0) else if (strchr (fci->flags2, '2') != 0)
y2k_level = 2; y2k_level = 2;
if (y2k_level == 3) 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); format_char);
else if (y2k_level == 2) 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)
@ -2187,7 +2184,7 @@ check_format_info_main (int *status, format_check_results *res,
++format_chars; ++format_chars;
if (*format_chars != ']') if (*format_chars != ']')
/* The end of the format string was reached. */ /* 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; wanted_type = 0;
@ -2221,7 +2218,7 @@ check_format_info_main (int *status, format_check_results *res,
&& ADJ_STD (wanted_type_std) > ADJ_STD (fci->std)) && ADJ_STD (wanted_type_std) > ADJ_STD (fci->std))
{ {
if (ADJ_STD (wanted_type_std) > C_STD_VER) 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, C_STD_NAME (wanted_type_std), length_chars,
format_char, fki->name); format_char, fki->name);
} }

9
gcc/pretty-print.c
View File

@ -179,8 +179,10 @@ pp_base_indent (pretty_printer *pp)
%p: pointer. %p: pointer.
%m: strerror(text->err_no) - does not consume a value from args_ptr. %m: strerror(text->err_no) - does not consume a value from args_ptr.
%%: '%'. %%: '%'.
%`: opening quote. %<: opening quote.
%': closing 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. %.*s: a substring the length of which is specified by an integer.
%H: location_t. %H: location_t.
Flag 'q': quote formatted text (must come immediately after '%'). */ Flag 'q': quote formatted text (must come immediately after '%'). */
@ -292,10 +294,11 @@ pp_base_format_text (pretty_printer *pp, text_info *text)
pp_character (pp, '%'); pp_character (pp, '%');
break; break;
case '`': case '<':
pp_string (pp, open_quote); pp_string (pp, open_quote);
break; break;
case '>':
case '\'': case '\'':
pp_string (pp, close_quote); pp_string (pp, close_quote);
break; break;