diff options
author | neil <neil@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-08-04 16:28:14 +0000 |
---|---|---|
committer | neil <neil@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-08-04 16:28:14 +0000 |
commit | f8d396cdeac903221bb452637843d2a89c59b989 (patch) | |
tree | d9a94dd57cbcb162a1616b5fe4623e5c76a95412 /gcc/c-lex.c | |
parent | edbd9f4cce37c1f3336d8390ffb01e6d6145ab24 (diff) | |
download | gcc-f8d396cdeac903221bb452637843d2a89c59b989.tar.gz |
* cpphash.h (struct cpp_reader): New member directive_line.
* cpplib.h (struct cpp_callbacks): Update prototypes of callbacks.
* cpplib.c (do_define, do_undef, do_ident, do_include_common,
do_pragma): Pass line to callbacks.
(start_directive): Record line of directive.
* cppmain.c (cb_ident, cb_define, cb_undef, cb_def_pragma,
cb_include): Similarly.
* c-lex.c (cb_ident, cb_define, cb_undef, cb_def_pragma):
Similarly.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@44637 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/c-lex.c')
-rw-r--r-- | gcc/c-lex.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/gcc/c-lex.c b/gcc/c-lex.c index ffd3b744172..89e17021fac 100644 --- a/gcc/c-lex.c +++ b/gcc/c-lex.c @@ -86,11 +86,14 @@ static tree lex_string PARAMS ((const char *, unsigned int, int)); static tree lex_charconst PARAMS ((const cpp_token *)); static void update_header_times PARAMS ((const char *)); static int dump_one_header PARAMS ((splay_tree_node, void *)); -static void cb_ident PARAMS ((cpp_reader *, const cpp_string *)); +static void cb_ident PARAMS ((cpp_reader *, unsigned int, + const cpp_string *)); static void cb_file_change PARAMS ((cpp_reader *, const cpp_file_change *)); -static void cb_def_pragma PARAMS ((cpp_reader *)); -static void cb_define PARAMS ((cpp_reader *, cpp_hashnode *)); -static void cb_undef PARAMS ((cpp_reader *, cpp_hashnode *)); +static void cb_def_pragma PARAMS ((cpp_reader *, unsigned int)); +static void cb_define PARAMS ((cpp_reader *, unsigned int, + cpp_hashnode *)); +static void cb_undef PARAMS ((cpp_reader *, unsigned int, + cpp_hashnode *)); const char * init_c_lex (filename) @@ -222,8 +225,9 @@ dump_time_statistics () No need to deal with linemarkers under normal conditions. */ static void -cb_ident (pfile, str) +cb_ident (pfile, line, str) cpp_reader *pfile ATTRIBUTE_UNUSED; + unsigned int line ATTRIBUTE_UNUSED; const cpp_string *str ATTRIBUTE_UNUSED; { #ifdef ASM_OUTPUT_IDENT @@ -306,8 +310,9 @@ cb_file_change (pfile, fc) } static void -cb_def_pragma (pfile) +cb_def_pragma (pfile, line) cpp_reader *pfile; + unsigned int line ATTRIBUTE_UNUSED; { /* Issue a warning message if we have been asked to do so. Ignore unknown pragmas in system headers unless an explicit @@ -333,8 +338,9 @@ cb_def_pragma (pfile) /* #define callback for DWARF and DWARF2 debug info. */ static void -cb_define (pfile, node) +cb_define (pfile, line, node) cpp_reader *pfile; + unsigned int line ATTRIBUTE_UNUSED; cpp_hashnode *node; { (*debug_hooks->define) (cpp_get_line (pfile)->line, @@ -343,8 +349,9 @@ cb_define (pfile, node) /* #undef callback for DWARF and DWARF2 debug info. */ static void -cb_undef (pfile, node) +cb_undef (pfile, line, node) cpp_reader *pfile; + unsigned int line ATTRIBUTE_UNUSED; cpp_hashnode *node; { (*debug_hooks->undef) (cpp_get_line (pfile)->line, |