diff options
| author | Per Bothner <per@bothner.com> | 2005-03-11 22:37:46 -0800 |
|---|---|---|
| committer | Per Bothner <bothner@gcc.gnu.org> | 2005-03-11 22:37:46 -0800 |
| commit | 6037d88d58ffcacc4ee354f4300910589dc5ce47 (patch) | |
| tree | 65b4a8dab5e3ade6d18469d0c871b15a2a066e5a /gcc/c-lex.c | |
| parent | 210e185272bc34731909e0a53fb982d3ae434516 (diff) | |
| download | gcc-6037d88d58ffcacc4ee354f4300910589dc5ce47.zip gcc-6037d88d58ffcacc4ee354f4300910589dc5ce47.tar.gz gcc-6037d88d58ffcacc4ee354f4300910589dc5ce47.tar.bz2 | |
c-tree.h (struct c_declarator): New id_loc field.
* c-tree.h (struct c_declarator): New id_loc field.
* c-pragma.h (c_lex_with_flags): Take position reference.
* c-lex.c (c_lex_with_flags): Set passed-in location from cpp token,
iff USE_MAPPED_LOCATION. (Type doesn't match otherwise.)
(c_lex): Pass dummy location to c_lex_with_flags.
* c-parser.c (c_lex_one_token): Set c_token's location using
c_lex_with_flags, instead of input_location, which might be "ahead".
(c_parser_direct_declarator): Set declarator's id_loc from
c_token's id_loc.
* c-decl.c (grokdeclarator): Set DECL_SOURCE_LOCATION from
declarator's id_loc, rather than probably-imprecise input_location.
(build_id_declarator): Initialize c_declarator's id_loc field.
From-SVN: r96329
Diffstat (limited to 'gcc/c-lex.c')
| -rw-r--r-- | gcc/c-lex.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gcc/c-lex.c b/gcc/c-lex.c index f5425ce..fdc1ff6 100644 --- a/gcc/c-lex.c +++ b/gcc/c-lex.c @@ -332,7 +332,7 @@ cb_undef (cpp_reader * ARG_UNUSED (pfile), source_location loc, non-NULL. */ enum cpp_ttype -c_lex_with_flags (tree *value, unsigned char *cpp_flags) +c_lex_with_flags (tree *value, location_t *loc, unsigned char *cpp_flags) { static bool no_more_pch; const cpp_token *tok; @@ -344,6 +344,11 @@ c_lex_with_flags (tree *value, unsigned char *cpp_flags) type = tok->type; retry_after_at: +#ifdef USE_MAPPED_LOCATION + *loc = tok->src_loc; +#else + *loc = input_location; +#endif switch (type) { case CPP_PADDING: @@ -487,7 +492,8 @@ c_lex_with_flags (tree *value, unsigned char *cpp_flags) enum cpp_ttype c_lex (tree *value) { - return c_lex_with_flags (value, NULL); + location_t loc; + return c_lex_with_flags (value, &loc, NULL); } /* Returns the narrowest C-visible unsigned type, starting with the |