diff options
author | David Malcolm <dmalcolm@redhat.com> | 2018-11-13 20:05:03 +0000 |
---|---|---|
committer | David Malcolm <dmalcolm@gcc.gnu.org> | 2018-11-13 20:05:03 +0000 |
commit | 620e594be58d2f933902a6619fd20aa618070b4b (patch) | |
tree | 18b833ac960291d05524d5994ae4292048632226 /libcpp/location-example.txt | |
parent | f9731de3db4c59ff0a241ce2c3d6f80aca5b5c28 (diff) |
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
Diffstat (limited to 'libcpp/location-example.txt')
-rw-r--r-- | libcpp/location-example.txt | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/libcpp/location-example.txt b/libcpp/location-example.txt index 14b5c2e284a..829ca53b89b 100644 --- a/libcpp/location-example.txt +++ b/libcpp/location-example.txt @@ -20,17 +20,17 @@ extern int foo (); The undocumented -fdump-internal-locations option outputs this information -to stderr, showing what each source_location value means. Source code -lines are quoted, showing both per-line source_location values and -per-line&column source_location values (written vertically under the +to stderr, showing what each location_t value means. Source code +lines are quoted, showing both per-line location_t values and +per-line&column location_t values (written vertically under the corresponding character of source code). VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV RESERVED LOCATIONS - source_location interval: 0 <= loc < 2 + location_t interval: 0 <= loc < 2 ORDINARY MAP: 0 - source_location interval: 32 <= loc < 64 + location_t interval: 32 <= loc < 64 file: test.c starting at line: 1 column bits: 12 @@ -40,21 +40,21 @@ test.c: 1|loc: 32|#include "test.h" |46802468024680246 ORDINARY MAP: 1 - source_location interval: 64 <= loc < 96 + location_t interval: 64 <= loc < 96 file: <built-in> starting at line: 0 column bits: 0 range bits: 0 ORDINARY MAP: 2 - source_location interval: 96 <= loc < 128 + location_t interval: 96 <= loc < 128 file: <command-line> starting at line: 0 column bits: 0 range bits: 0 ORDINARY MAP: 3 - source_location interval: 128 <= loc < 160128 + location_t interval: 128 <= loc < 160128 file: /usr/include/stdc-predef.h starting at line: 1 column bits: 12 @@ -62,14 +62,14 @@ ORDINARY MAP: 3 (contents of /usr/include/stdc-predef.h snipped for brevity) ORDINARY MAP: 4 - source_location interval: 160128 <= loc < 160160 + location_t interval: 160128 <= loc < 160160 file: <command-line> starting at line: 32 column bits: 12 range bits: 5 ORDINARY MAP: 5 - source_location interval: 160160 <= loc < 164256 + location_t interval: 160160 <= loc < 164256 file: test.c starting at line: 1 column bits: 12 @@ -81,7 +81,7 @@ test.c: 1|loc:160160|#include "test.h" |24680246802468024 ORDINARY MAP: 6 - source_location interval: 164256 <= loc < 173280 + location_t interval: 164256 <= loc < 173280 file: test.h starting at line: 1 column bits: 12 @@ -103,7 +103,7 @@ test.h: 3|loc:172448|#define PLUS(A, B) A + B |024680246802468024680246 ORDINARY MAP: 7 - source_location interval: 173280 <= loc < 202016 + location_t interval: 173280 <= loc < 202016 file: test.c starting at line: 2 column bits: 12 @@ -150,10 +150,10 @@ test.c: 9|loc:201952|} |4 UNALLOCATED LOCATIONS - source_location interval: 202016 <= loc < 2147483633 + location_t interval: 202016 <= loc < 2147483633 MACRO 1: PLUS (7 tokens) - source_location interval: 2147483633 <= loc < 2147483640 + location_t interval: 2147483633 <= loc < 2147483640 test.c:7:11: note: expansion point is location 194115 int b = PLUS (3,4); ^~~~ @@ -189,7 +189,7 @@ x-location == y-location == 2947526575 encodes token # 800042942 x-location == y-location == 2947526575 encodes token # 800042942 MACRO 0: PLUS (7 tokens) - source_location interval: 2147483640 <= loc < 2147483647 + location_t interval: 2147483640 <= loc < 2147483647 test.c:6:11: note: expansion point is location 190019 int a = PLUS (1,2); ^~~~ @@ -224,9 +224,9 @@ x-location == y-location == 2947526575 encodes token # 800042935 6: 2947526575, 2947526575 x-location == y-location == 2947526575 encodes token # 800042935 -MAX_SOURCE_LOCATION - source_location interval: 2147483647 <= loc < 2147483648 +MAX_LOCATION_T + location_t interval: 2147483647 <= loc < 2147483648 AD-HOC LOCATIONS - source_location interval: 2147483648 <= loc < 4294967295 + location_t interval: 2147483648 <= loc < 4294967295 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |