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;
/* General output routines. */
-static void scan_translation_unit PARAMS ((cpp_reader *));
-static void scan_translation_unit_trad PARAMS ((cpp_reader *));
-static void account_for_newlines PARAMS ((const uchar *, size_t));
-static int dump_macro PARAMS ((cpp_reader *, cpp_hashnode *, void *));
+static void scan_translation_unit (cpp_reader *);
+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 PARAMS ((const struct line_map *, unsigned int,
- const char *));
-static void maybe_print_line PARAMS ((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 PARAMS ((cpp_reader *, const cpp_token *, int));
-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_def_pragma PARAMS ((cpp_reader *, unsigned int));
+static void cb_line_change (cpp_reader *, const cpp_token *, int);
+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 *, fileline, const cpp_string *);
+static void cb_def_pragma (cpp_reader *, fileline);
/* Preprocess and output. */
void
-preprocess_file (pfile)
- cpp_reader *pfile;
+preprocess_file (cpp_reader *pfile)
{
/* A successful cpp_read_main_file guarantees that we can call
cpp_scan_nooutput or cpp_get_token next. */
/* Set up the callbacks as appropriate. */
void
-init_pp_output (out_stream)
- FILE *out_stream;
+init_pp_output (FILE *out_stream)
{
cpp_callbacks *cb = cpp_get_callbacks (parse_in);
- cb->register_builtins = cb_register_builtins;
-
if (!flag_no_output)
{
cb->line_change = cb_line_change;
/* 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;
/* Writes out the preprocessed file, handling spacing and paste
avoidance issues. */
static void
-scan_translation_unit (pfile)
- cpp_reader *pfile;
+scan_translation_unit (cpp_reader *pfile)
{
bool avoid_paste = false;
/* Adjust print.line for newlines embedded in output. */
static void
-account_for_newlines (str, len)
- const uchar *str;
- size_t len;
+account_for_newlines (const unsigned char *str, size_t len)
{
while (len--)
if (*str++ == '\n')
/* Writes out a traditionally preprocessed file. */
static void
-scan_translation_unit_trad (pfile)
- cpp_reader *pfile;
+scan_translation_unit_trad (cpp_reader *pfile)
{
while (_cpp_read_logical_line_trad (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 (map, 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)
/* Output a line marker for logical line LINE. Special flags are "1"
or "2" indicating entering or leaving a file. */
static void
-print_line (map, line, special_flags)
- 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)
/* Called when a line of output is started. TOKEN is the first token
of the line, and at end of file will be CPP_EOF. */
static void
-cb_line_change (pfile, token, parsing_args)
- cpp_reader *pfile;
- const cpp_token *token;
- int parsing_args;
+cb_line_change (cpp_reader *pfile, const cpp_token *token,
+ int parsing_args)
{
if (token->type == CPP_EOF || parsing_args)
return;
}
static void
-cb_ident (pfile, line, str)
- cpp_reader *pfile ATTRIBUTE_UNUSED;
- unsigned int line;
- const cpp_string * str;
+cb_ident (cpp_reader *pfile ATTRIBUTE_UNUSED, fileline line,
+ const cpp_string *str)
{
maybe_print_line (print.map, line);
fprintf (print.outf, "#ident \"%s\"\n", str->text);
}
static void
-cb_define (pfile, line, node)
- 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);
}
static void
-cb_undef (pfile, line, node)
- cpp_reader *pfile ATTRIBUTE_UNUSED;
- unsigned int line;
- cpp_hashnode *node;
+cb_undef (cpp_reader *pfile ATTRIBUTE_UNUSED, fileline line,
+ cpp_hashnode *node)
{
maybe_print_line (print.map, line);
fprintf (print.outf, "#undef %s\n", NODE_NAME (node));
}
static void
-cb_include (pfile, line, dir, header)
- cpp_reader *pfile;
- unsigned int line;
- const unsigned char *dir;
- const cpp_token *header;
+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);
- fprintf (print.outf, "#%s %s\n", dir,
- cpp_token_as_text (pfile, header));
+ if (angle_brackets)
+ fprintf (print.outf, "#%s <%s>\n", dir, header);
+ else
+ fprintf (print.outf, "#%s \"%s\"\n", dir, header);
print.line++;
}
pointing to freed memory, and so must not be dereferenced. */
void
-pp_file_change (map)
- const struct line_map *map;
+pp_file_change (const struct line_map *map)
{
const char *flags = "";
if (flag_no_line_commands || flag_no_output)
return;
- /* First time? */
- if (print.map == NULL)
- {
- /* Avoid printing foo.i when the main file is foo.c. */
- if (!cpp_get_options (parse_in)->preprocessed)
- print_line (map, map->from_line, flags);
- }
- else
+ if (map != NULL)
{
- /* Bring current file to correct line when entering a new file. */
- if (map->reason == LC_ENTER)
- maybe_print_line (map - 1, map->from_line - 1);
-
- if (map->reason == LC_ENTER)
- flags = " 1";
- else if (map->reason == LC_LEAVE)
- flags = " 2";
- print_line (map, map->from_line, flags);
+ /* First time? */
+ if (print.map == NULL)
+ {
+ /* Avoid printing foo.i when the main file is foo.c. */
+ if (!cpp_get_options (parse_in)->preprocessed)
+ print_line (map, map->from_line, flags);
+ }
+ else
+ {
+ /* Bring current file to correct line when entering a new file. */
+ if (map->reason == LC_ENTER)
+ maybe_print_line (map - 1, map->from_line - 1);
+
+ if (map->reason == LC_ENTER)
+ flags = " 1";
+ else if (map->reason == LC_LEAVE)
+ flags = " 2";
+ print_line (map, map->from_line, flags);
+ }
}
print.map = map;
/* Copy a #pragma directive to the preprocessed output. */
static void
-cb_def_pragma (pfile, line)
- cpp_reader *pfile;
- unsigned int line;
+cb_def_pragma (cpp_reader *pfile, fileline line)
{
maybe_print_line (print.map, line);
fputs ("#pragma ", print.outf);
/* Dump out the hash table. */
static int
-dump_macro (pfile, node, v)
- cpp_reader *pfile;
- cpp_hashnode *node;
- void *v ATTRIBUTE_UNUSED;
+dump_macro (cpp_reader *pfile, cpp_hashnode *node, void *v ATTRIBUTE_UNUSED)
{
if (node->type == NT_MACRO && !(node->flags & NODE_BUILTIN))
{
OSDN Git Service
