OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

c-ppoutput.c (print): Use fileline typedef for field 'line'.

Browse Source 
* c-ppoutput.c (print):  Use fileline typedef for field 'line'.
	(print_line, maybe_print_line, cb_define, cb_undef, cb_include,
	cb_ident, cb_def_pragma):  Use fileline typedef.
	* cpphash.h (struct cpp_reader):  Likewise for field out.first_line.

From-SVN: r71554
This commit is contained in:
Mike Stump 2003-09-19 00:47:53 +00:00 committed by Per Bothner
parent 7f7de61bde
commit a1c18b4ac8
3 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/ChangeLog
View File

@ -1,3 +1,10 @@
2003-09-18 Mike Stump <mrs@apple.com>
* c-ppoutput.c (print): Use fileline typedef for field 'line'.
(print_line, maybe_print_line, cb_define, cb_undef, cb_include,
cb_ident, cb_def_pragma): Use fileline typedef.
* cpphash.h (struct cpp_reader): Likewise for field out.first_line.
2003-09-18 Danny Smith <dannysmith@users.sourceforge.net>
* config/i386/winnt.c (gen_stdcall_suffix): Quit summation of

33
gcc/c-ppoutput.c
View File

@ -35,7 +35,7 @@ static struct
const struct line_map *map; /* Logical to physical line mappings. */
const cpp_token *prev; /* Previous token. */
const cpp_token *source; /* Source token for spacing. */
unsigned int line; /* Line currently being written. */
fileline line; /* Line currently being written. */
unsigned char printed; /* Nonzero if something output at line. */
} print;
@ -45,19 +45,18 @@ static void scan_translation_unit_trad (cpp_reader *);
static void account_for_newlines (const unsigned char *, size_t);
static int dump_macro (cpp_reader *, cpp_hashnode *, void *);
static void print_line (const struct line_map *, unsigned int,
const char *);
static void maybe_print_line (const struct line_map *, unsigned int);
static void print_line (const struct line_map *, fileline, const char *);
static void maybe_print_line (const struct line_map *, fileline);
/* Callback routines for the parser. Most of these are active only
in specific modes. */
static void cb_line_change (cpp_reader *, const cpp_token *, int);
static void cb_define (cpp_reader *, unsigned int, cpp_hashnode *);
static void cb_undef (cpp_reader *, unsigned int, cpp_hashnode *);
static void cb_include (cpp_reader *, unsigned int, const unsigned char *,
static void cb_define (cpp_reader *, fileline, cpp_hashnode *);
static void cb_undef (cpp_reader *, fileline, cpp_hashnode *);
static void cb_include (cpp_reader *, fileline, const unsigned char *,
const char *, int);
static void cb_ident (cpp_reader *, unsigned int, const cpp_string *);
static void cb_def_pragma (cpp_reader *, unsigned int);
static void cb_ident (cpp_reader *, fileline, const cpp_string *);
static void cb_def_pragma (cpp_reader *, fileline);
/* Preprocess and output. */
void
@ -116,7 +115,7 @@ init_pp_output (FILE *out_stream)
/* Initialize the print structure. Setting print.line to -1 here is
a trick to guarantee that the first token of the file will cause
a linemarker to be output by maybe_print_line. */
print.line = (unsigned int) -1;
print.line = (fileline) -1;
print.printed = 0;
print.prev = 0;
print.map = 0;
@ -200,7 +199,7 @@ scan_translation_unit_trad (cpp_reader *pfile)
different line to the current one, output the required newlines or
a line marker, and return 1. Otherwise return 0. */
static void
maybe_print_line (const struct line_map *map, unsigned int line)
maybe_print_line (const struct line_map *map, fileline line)
{
/* End the previous line of text. */
if (print.printed)
@ -225,7 +224,7 @@ maybe_print_line (const struct line_map *map, unsigned int line)
/* Output a line marker for logical line LINE. Special flags are "1"
or "2" indicating entering or leaving a file. */
static void
print_line (const struct line_map *map, unsigned int line, const char *special_flags)
print_line (const struct line_map *map, fileline line, const char *special_flags)
{
/* End any previous line of text. */
if (print.printed)
@ -289,7 +288,7 @@ cb_line_change (cpp_reader *pfile, const cpp_token *token,
}
static void
cb_ident (cpp_reader *pfile ATTRIBUTE_UNUSED, unsigned int line,
cb_ident (cpp_reader *pfile ATTRIBUTE_UNUSED, fileline line,
const cpp_string *str)
{
maybe_print_line (print.map, line);
@ -298,7 +297,7 @@ cb_ident (cpp_reader *pfile ATTRIBUTE_UNUSED, unsigned int line,
}
static void
cb_define (cpp_reader *pfile, unsigned int line, cpp_hashnode *node)
cb_define (cpp_reader *pfile, fileline line, cpp_hashnode *node)
{
maybe_print_line (print.map, line);
fputs ("#define ", print.outf);
@ -315,7 +314,7 @@ cb_define (cpp_reader *pfile, unsigned int line, cpp_hashnode *node)
}
static void
cb_undef (cpp_reader *pfile ATTRIBUTE_UNUSED, unsigned int line,
cb_undef (cpp_reader *pfile ATTRIBUTE_UNUSED, fileline line,
cpp_hashnode *node)
{
maybe_print_line (print.map, line);
@ -324,7 +323,7 @@ cb_undef (cpp_reader *pfile ATTRIBUTE_UNUSED, unsigned int line,
}
static void
cb_include (cpp_reader *pfile ATTRIBUTE_UNUSED, unsigned int line,
cb_include (cpp_reader *pfile ATTRIBUTE_UNUSED, fileline line,
const unsigned char *dir, const char *header, int angle_brackets)
{
maybe_print_line (print.map, line);
@ -372,7 +371,7 @@ pp_file_change (const struct line_map *map)
/* Copy a #pragma directive to the preprocessed output. */
static void
cb_def_pragma (cpp_reader *pfile, unsigned int line)
cb_def_pragma (cpp_reader *pfile, fileline line)
{
maybe_print_line (print.map, line);
fputs ("#pragma ", print.outf);

2
gcc/cpphash.h
View File

@ -451,7 +451,7 @@ struct cpp_reader
uchar *base;
uchar *limit;
uchar *cur;
unsigned int first_line;
fileline first_line;
} out;
/* Used to save the original line number during traditional