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

c-ada-spec.c (LOCATION_COL): Delete.

Browse Source 
* c-ada-spec.c (LOCATION_COL): Delete.
	(compare_location): New function.
	(compare_node): Use it.
	(compare_comment): Likewise.

From-SVN: r192574
This commit is contained in:
Eric Botcazou 2012-10-18 18:47:23 +00:00 committed by Eric Botcazou
parent 21a11667fc
commit 67e4210bf1
2 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/c-family/ChangeLog
View File

@ -1,3 +1,10 @@
2012-10-18 Eric Botcazou <ebotcazou@adacore.com>
* c-ada-spec.c (LOCATION_COL): Delete.
(compare_location): New function.
(compare_node): Use it.
(compare_comment): Likewise.
2012-10-16 Manuel López-Ibáñez <manu@gcc.gnu.org>
PR c/53063

36
gcc/c-family/c-ada-spec.c
View File

@ -67,8 +67,6 @@ static void dump_ads (const char *, void (*)(const char *),
static char *to_ada_name (const char *, int *);
static bool separate_class_package (tree);
#define LOCATION_COL(LOC) ((expand_location (LOC)).column)
#define INDENT(SPACE) do { \
int i; for (i = 0; i<SPACE; i++) pp_space (buffer); } while (0)
@ -553,6 +551,26 @@ decl_sloc (const_tree decl, bool last)
return decl_sloc_common (decl, last, false);
}
/* Compare two locations LHS and RHS. */
static int
compare_location (location_t lhs, location_t rhs)
{
expanded_location xlhs = expand_location (lhs);
expanded_location xrhs = expand_location (rhs);
if (xlhs.file != xrhs.file)
return filename_cmp (xlhs.file, xrhs.file);
if (xlhs.line != xrhs.line)
return xlhs.line - xrhs.line;
if (xlhs.column != xrhs.column)
return xlhs.column - xrhs.column;
return 0;
}
/* Compare two declarations (LP and RP) by their source location. */
static int
@ -561,7 +579,7 @@ compare_node (const void *lp, const void *rp)
const_tree lhs = *((const tree *) lp);
const_tree rhs = *((const tree *) rp);
return decl_sloc (lhs, true) - decl_sloc (rhs, true);
return compare_location (decl_sloc (lhs, true), decl_sloc (rhs, true));
}
/* Compare two comments (LP and RP) by their source location. */
@ -572,17 +590,7 @@ compare_comment (const void *lp, const void *rp)
const cpp_comment *lhs = (const cpp_comment *) lp;
const cpp_comment *rhs = (const cpp_comment *) rp;
if (LOCATION_FILE (lhs->sloc) != LOCATION_FILE (rhs->sloc))
return filename_cmp (LOCATION_FILE (lhs->sloc),
LOCATION_FILE (rhs->sloc));
if (LOCATION_LINE (lhs->sloc) != LOCATION_LINE (rhs->sloc))
return LOCATION_LINE (lhs->sloc) - LOCATION_LINE (rhs->sloc);
if (LOCATION_COL (lhs->sloc) != LOCATION_COL (rhs->sloc))
return LOCATION_COL (lhs->sloc) - LOCATION_COL (rhs->sloc);
return 0;
return compare_location (lhs->sloc, rhs->sloc);
}
static tree *to_dump = NULL;