diff options
| author | Neil Booth <neil@daikokuya.demon.co.uk> | 2001-08-04 16:28:14 +0000 |
|---|---|---|
| committer | Neil Booth <neil@gcc.gnu.org> | 2001-08-04 16:28:14 +0000 |
| commit | 8bbbef343486eea56bb5c9ebf241c0872e4083b3 (patch) | |
| tree | d9a94dd57cbcb162a1616b5fe4623e5c76a95412 /gcc/cppmain.c | |
| parent | 95146dd651f1e96713c9eaeaa14bc61362b3f2f4 (diff) | |
| download | gcc-8bbbef343486eea56bb5c9ebf241c0872e4083b3.zip gcc-8bbbef343486eea56bb5c9ebf241c0872e4083b3.tar.gz gcc-8bbbef343486eea56bb5c9ebf241c0872e4083b3.tar.bz2 | |
cpphash.h (struct cpp_reader): New member directive_line.
* 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.
From-SVN: r44637
Diffstat (limited to 'gcc/cppmain.c')
| -rw-r--r-- | gcc/cppmain.c | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/gcc/cppmain.c b/gcc/cppmain.c index 9dfb680..6302610 100644 --- a/gcc/cppmain.c +++ b/gcc/cppmain.c @@ -54,13 +54,14 @@ static void maybe_print_line PARAMS ((unsigned int)); /* Callback routines for the parser. Most of these are active only in specific modes. */ -static void cb_define PARAMS ((cpp_reader *, cpp_hashnode *)); -static void cb_undef PARAMS ((cpp_reader *, cpp_hashnode *)); -static void cb_include PARAMS ((cpp_reader *, const unsigned char *, - const cpp_token *)); -static void cb_ident PARAMS ((cpp_reader *, const cpp_string *)); +static void cb_define PARAMS ((cpp_reader *, unsigned int, cpp_hashnode *)); +static void cb_undef PARAMS ((cpp_reader *, unsigned int, cpp_hashnode *)); +static void cb_include PARAMS ((cpp_reader *, unsigned int, + const unsigned char *, const cpp_token *)); +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_def_pragma PARAMS ((cpp_reader *, unsigned int)); const char *progname; /* Needs to be global. */ static cpp_reader *pfile; /* An opaque handle. */ @@ -345,8 +346,9 @@ print_line (special_flags) /* Callbacks. */ 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; { maybe_print_line (cpp_get_line (pfile)->output_line); @@ -355,8 +357,9 @@ cb_ident (pfile, str) } static void -cb_define (pfile, node) +cb_define (pfile, line, node) cpp_reader *pfile; + unsigned int line ATTRIBUTE_UNUSED; cpp_hashnode *node; { maybe_print_line (cpp_get_line (pfile)->output_line); @@ -373,8 +376,9 @@ cb_define (pfile, node) } static void -cb_undef (pfile, node) +cb_undef (pfile, line, node) cpp_reader *pfile; + unsigned int line ATTRIBUTE_UNUSED; cpp_hashnode *node; { maybe_print_line (cpp_get_line (pfile)->output_line); @@ -383,8 +387,9 @@ cb_undef (pfile, node) } static void -cb_include (pfile, dir, header) +cb_include (pfile, line, dir, header) cpp_reader *pfile ATTRIBUTE_UNUSED; + unsigned int line ATTRIBUTE_UNUSED; const unsigned char *dir; const cpp_token *header; { @@ -429,8 +434,9 @@ cb_file_change (pfile, fc) /* Copy a #pragma directive to the preprocessed output. LINE is the line of the current source file, not the logical line. */ static void -cb_def_pragma (pfile) +cb_def_pragma (pfile, line) cpp_reader *pfile; + unsigned int line ATTRIBUTE_UNUSED; { maybe_print_line (cpp_get_line (pfile)->output_line); fputs ("#pragma ", print.outf); |