Eliminate source_location in favor of location_t
Historically GCC used location_t, while libcpp used source_location. This inconsistency has been annoying me for a while, so this patch removes source_location in favor of location_t throughout (as the latter is shorter). gcc/ChangeLog: * builtins.c: Replace "source_location" with "location_t". * diagnostic-show-locus.c: Likewise. * diagnostic.c: Likewise. * dumpfile.c: Likewise. * gcc-rich-location.h: Likewise. * genmatch.c: Likewise. * gimple.h: Likewise. * gimplify.c: Likewise. * input.c: Likewise. * input.h: Likewise. Eliminate the typedef. * omp-expand.c: Likewise. * selftest.h: Likewise. * substring-locations.h (get_source_location_for_substring): Rename to.. (get_location_within_string): ...this. * tree-cfg.c: Replace "source_location" with "location_t". * tree-cfgcleanup.c: Likewise. * tree-diagnostic.c: Likewise. * tree-into-ssa.c: Likewise. * tree-outof-ssa.c: Likewise. * tree-parloops.c: Likewise. * tree-phinodes.c: Likewise. * tree-phinodes.h: Likewise. * tree-ssa-loop-ivopts.c: Likewise. * tree-ssa-loop-manip.c: Likewise. * tree-ssa-phiopt.c: Likewise. * tree-ssa-phiprop.c: Likewise. * tree-ssa-threadupdate.c: Likewise. * tree-ssa.c: Likewise. * tree-ssa.h: Likewise. * tree-vect-loop-manip.c: Likewise. gcc/c-family/ChangeLog: * c-common.c (c_get_substring_location): Update for renaming of get_source_location_for_substring to get_location_within_string. * c-lex.c: Replace "source_location" with "location_t". * c-opts.c: Likewise. * c-ppoutput.c: Likewise. gcc/c/ChangeLog: * c-decl.c: Replace "source_location" with "location_t". * c-tree.h: Likewise. * c-typeck.c: Likewise. * gimple-parser.c: Likewise. gcc/cp/ChangeLog: * call.c: Replace "source_location" with "location_t". * cp-tree.h: Likewise. * cvt.c: Likewise. * name-lookup.c: Likewise. * parser.c: Likewise. * typeck.c: Likewise. gcc/fortran/ChangeLog: * cpp.c: Replace "source_location" with "location_t". * gfortran.h: Likewise. gcc/go/ChangeLog: * go-gcc-diagnostics.cc: Replace "source_location" with "location_t". * go-gcc.cc: Likewise. * go-linemap.cc: Likewise. * go-location.h: Likewise. * gofrontend/README: Likewise. gcc/jit/ChangeLog: * jit-playback.c: Replace "source_location" with "location_t". gcc/testsuite/ChangeLog: * g++.dg/plugin/comment_plugin.c: Replace "source_location" with "location_t". * gcc.dg/plugin/diagnostic_plugin_test_show_locus.c: Likewise. libcc1/ChangeLog: * libcc1plugin.cc: Replace "source_location" with "location_t". (plugin_context::get_source_location): Rename to... (plugin_context::get_location_t): ...this. * libcp1plugin.cc: Likewise. libcpp/ChangeLog: * charset.c: Replace "source_location" with "location_t". * directives-only.c: Likewise. * directives.c: Likewise. * errors.c: Likewise. * expr.c: Likewise. * files.c: Likewise. * include/cpplib.h: Likewise. Rename MAX_SOURCE_LOCATION to MAX_LOCATION_T. * include/line-map.h: Likewise. * init.c: Likewise. * internal.h: Likewise. * lex.c: Likewise. * line-map.c: Likewise. * location-example.txt: Likewise. * macro.c: Likewise. * pch.c: Likewise. * traditional.c: Likewise. From-SVN: r266085
This commit is contained in:
committed by
David Malcolm
parent
f9731de3db
commit
620e594be5
+7
-7
@@ -30,7 +30,7 @@ struct op
|
||||
{
|
||||
const cpp_token *token; /* The token forming op (for diagnostics). */
|
||||
cpp_num value; /* The value logically "right" of op. */
|
||||
source_location loc; /* The location of this value. */
|
||||
location_t loc; /* The location of this value. */
|
||||
enum cpp_ttype op;
|
||||
};
|
||||
|
||||
@@ -52,13 +52,13 @@ static cpp_num num_equality_op (cpp_reader *, cpp_num, cpp_num,
|
||||
enum cpp_ttype);
|
||||
static cpp_num num_mul (cpp_reader *, cpp_num, cpp_num);
|
||||
static cpp_num num_div_op (cpp_reader *, cpp_num, cpp_num, enum cpp_ttype,
|
||||
source_location);
|
||||
location_t);
|
||||
static cpp_num num_lshift (cpp_num, size_t, size_t);
|
||||
static cpp_num num_rshift (cpp_num, size_t, size_t);
|
||||
|
||||
static cpp_num append_digit (cpp_num, int, int, size_t);
|
||||
static cpp_num parse_defined (cpp_reader *);
|
||||
static cpp_num eval_token (cpp_reader *, const cpp_token *, source_location);
|
||||
static cpp_num eval_token (cpp_reader *, const cpp_token *, location_t);
|
||||
static struct op *reduce (cpp_reader *, struct op *, enum cpp_ttype);
|
||||
static unsigned int interpret_float_suffix (cpp_reader *, const uchar *, size_t);
|
||||
static unsigned int interpret_int_suffix (cpp_reader *, const uchar *, size_t);
|
||||
@@ -505,7 +505,7 @@ cpp_get_userdef_suffix (const cpp_token *tok)
|
||||
VIRTUAL_LOCATION is the virtual location for TOKEN. */
|
||||
unsigned int
|
||||
cpp_classify_number (cpp_reader *pfile, const cpp_token *token,
|
||||
const char **ud_suffix, source_location virtual_location)
|
||||
const char **ud_suffix, location_t virtual_location)
|
||||
{
|
||||
const uchar *str = token->val.str.text;
|
||||
const uchar *limit;
|
||||
@@ -1091,7 +1091,7 @@ parse_defined (cpp_reader *pfile)
|
||||
operators). */
|
||||
static cpp_num
|
||||
eval_token (cpp_reader *pfile, const cpp_token *token,
|
||||
source_location virtual_location)
|
||||
location_t virtual_location)
|
||||
{
|
||||
cpp_num result;
|
||||
unsigned int temp;
|
||||
@@ -1288,7 +1288,7 @@ _cpp_parse_expr (cpp_reader *pfile, bool is_if)
|
||||
struct op *top = pfile->op_stack;
|
||||
unsigned int lex_count;
|
||||
bool saw_leading_not, want_value = true;
|
||||
source_location virtual_location = 0;
|
||||
location_t virtual_location = 0;
|
||||
|
||||
pfile->state.skip_eval = 0;
|
||||
|
||||
@@ -2086,7 +2086,7 @@ num_mul (cpp_reader *pfile, cpp_num lhs, cpp_num rhs)
|
||||
|
||||
static cpp_num
|
||||
num_div_op (cpp_reader *pfile, cpp_num lhs, cpp_num rhs, enum cpp_ttype op,
|
||||
source_location location)
|
||||
location_t location)
|
||||
{
|
||||
cpp_num result, sub;
|
||||
cpp_num_part mask;
|
||||
|
||||
Reference in New Issue
Block a user