diff options
author | Per Bothner <per@bothner.com> | 2004-07-14 17:02:30 -0700 |
---|---|---|
committer | Per Bothner <bothner@gcc.gnu.org> | 2004-07-14 17:02:30 -0700 |
commit | aa3c6dc1604edf2119da7cf6d39c6afab3a676d7 (patch) | |
tree | 590981ecbc489c808f0c696cd08606defbd93ffa /gcc/input.h | |
parent | 368b7a304e674df0e140b6dc164e670650c56486 (diff) | |
download | gcc-aa3c6dc1604edf2119da7cf6d39c6afab3a676d7.zip gcc-aa3c6dc1604edf2119da7cf6d39c6afab3a676d7.tar.gz gcc-aa3c6dc1604edf2119da7cf6d39c6afab3a676d7.tar.bz2 |
input.h: If USE_MAPPED_LOCATION...
* input.h: If USE_MAPPED_LOCATION, define separate expanded_location
structure with extra column field.
* tree.c (expand_location): Also fill in column field.
* gengtype-lex.l: Ignore expanded_location typedef, sinze gengtype
gets confused by the two conditionally-compiled definitions.
From-SVN: r84721
Diffstat (limited to 'gcc/input.h')
-rw-r--r-- | gcc/input.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/gcc/input.h b/gcc/input.h index f34c74e..f15ce66 100644 --- a/gcc/input.h +++ b/gcc/input.h @@ -28,7 +28,9 @@ extern struct line_maps line_table; /* The location for declarations in "<built-in>" */ #define BUILTINS_LOCATION ((source_location) 2) -typedef struct location_s GTY(()) +#ifdef USE_MAPPED_LOCATION + +typedef struct { /* The name of the source file involved. */ const char *file; @@ -36,11 +38,9 @@ typedef struct location_s GTY(()) /* The line-location in the source file. */ int line; - /* FUTURE (but confuses gentype): int column. */ + int column; } expanded_location; -#ifdef USE_MAPPED_LOCATION - extern expanded_location expand_location (source_location); #define UNKNOWN_LOCATION ((source_location) 0) @@ -49,6 +49,16 @@ typedef source_location source_locus; /* to be removed */ #else /* ! USE_MAPPED_LOCATION */ +struct location_s GTY(()) +{ + /* The name of the source file involved. */ + const char *file; + + /* The line-location in the source file. */ + int line; +}; + +typedef struct location_s expanded_location; typedef struct location_s location_t; typedef location_t *source_locus; |