c-common.c (if_elt): Use location_t in lieu of "file, line" pair.

* c-common.c (if_elt): Use location_t in lieu of "file, line" pair.
        (c_expand_start_cond): Adjust.
        (c_expand_end_cond): Don't use warning_with_file_and_file.
        (shadow_warning): Likewise.

From-SVN: r66304
This commit is contained in:
Gabriel Dos Reis 2003-04-30 20:27:26 +00:00 committed by Gabriel Dos Reis
parent 1dcfc9d1fa
commit fba020b134
2 changed files with 13 additions and 10 deletions

View File

@ -1,3 +1,10 @@
2003-04-30 Gabriel Dos Reis <gdr@integrable-solutions.net>
* c-common.c (if_elt): Use location_t in lieu of "file, line" pair.
(c_expand_start_cond): Adjust.
(c_expand_end_cond): Don't use warning_with_file_and_file.
(shadow_warning): Likewise.
2003-04-30 Nathan Sidwell <nathan@codesourcery.com>
* tree.h (DECL_POINTER_DEPTH): Remove.

View File

@ -726,8 +726,7 @@ static int constant_fits_type_p PARAMS ((tree, tree));
typedef struct
{
int compstmt_count;
int line;
const char *file;
location_t locus;
int needs_warning;
tree if_stmt;
} if_elt;
@ -919,8 +918,8 @@ c_expand_start_cond (cond, compstmt_count, if_stmt)
/* Record this if statement. */
if_stack[if_stack_pointer].compstmt_count = compstmt_count;
if_stack[if_stack_pointer].file = input_filename;
if_stack[if_stack_pointer].line = lineno;
if_stack[if_stack_pointer].locus.file = input_filename;
if_stack[if_stack_pointer].locus.line = lineno;
if_stack[if_stack_pointer].needs_warning = 0;
if_stack[if_stack_pointer].if_stmt = if_stmt;
if_stack_pointer++;
@ -943,9 +942,8 @@ c_expand_end_cond ()
{
if_stack_pointer--;
if (if_stack[if_stack_pointer].needs_warning)
warning_with_file_and_line (if_stack[if_stack_pointer].file,
if_stack[if_stack_pointer].line,
"suggest explicit braces to avoid ambiguous `else'");
warning ("%Hsuggest explicit braces to avoid ambiguous `else'",
&if_stack[if_stack_pointer].locus);
last_expr_type = NULL_TREE;
}
@ -4787,9 +4785,7 @@ shadow_warning (msgcode, name, decl)
};
warning (msgs[msgcode], name);
warning_with_file_and_line (DECL_SOURCE_FILE (decl),
DECL_SOURCE_LINE (decl),
"shadowed declaration is here");
warning ("%Hshadowed declaration is here", &DECL_SOURCE_LOCATION (decl));
}
/* Attribute handlers common to C front ends. */