/* fix-header.c - Make C header file suitable for C++.
Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998,
- 1999, 2000 Free Software Foundation, Inc.
+ 1999, 2000, 2001 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
#include "scan.h"
#include "cpplib.h"
-static void v_fatal PARAMS ((const char *, va_list)) ATTRIBUTE_NORETURN;
+static void v_fatal PARAMS ((const char *, va_list)) ATTRIBUTE_PRINTF (1,0) ATTRIBUTE_NORETURN;
static void fatal PARAMS ((const char *, ...)) ATTRIBUTE_PRINTF_1 ATTRIBUTE_NORETURN;
sstring buf;
char *inf_buffer;
char *inf_limit;
char *inf_ptr;
+static const char *cur_file;
/* Certain standard files get extra treatment */
static int inf_read_upto PARAMS ((sstring *, int));
static int inf_scan_ident PARAMS ((sstring *, int));
static int check_protection PARAMS ((int *, int *));
+static void cb_file_change PARAMS ((cpp_reader *, const struct line_map *));
static void
add_symbols (flags, names)
struct partial_proto
{
struct partial_proto *next;
- char *fname; /* name of function */
- char *rtype; /* return type */
struct fn_decl *fn;
int line_seen;
};
}
void
-recognized_extern (name, name_length, type, type_length)
- const char *name;
- const char *type ATTRIBUTE_UNUSED;
- int name_length, type_length ATTRIBUTE_UNUSED;
+recognized_extern (name)
+ const cpp_token *name;
{
switch (special_file_handling)
{
case errno_h:
- if (name_length == 5 && strncmp (name, "errno", 5) == 0 && !seen_errno)
+ if (cpp_ideq (name, "errno"))
seen_errno = 1, required_other--;
break;
}
/* Called by scan_decls if it saw a function definition for a function
- named FNAME, with return type RTYPE, and argument list ARGS,
- in source file FILE_SEEN on line LINE_SEEN.
- KIND is 'I' for an inline function;
- 'F' if a normal function declaration preceded by 'extern "C"'
- (or nested inside 'extern "C"' braces); or
- 'f' for other function declarations. */
+ named FNAME. KIND is 'I' for an inline function; 'F' if a normal
+ function declaration preceded by 'extern "C"' (or nested inside
+ 'extern "C"' braces); or 'f' for other function declarations. */
void
-recognized_function (fname, fname_length,
- kind, rtype, rtype_length,
- have_arg_list, file_seen, line_seen)
- const char *fname;
- int fname_length;
+recognized_function (fname, line, kind, have_arg_list)
+ const cpp_token *fname;
+ unsigned int line;
int kind; /* One of 'f' 'F' or 'I' */
- const char *rtype;
- int rtype_length;
int have_arg_list;
- const char *file_seen;
- int line_seen;
{
struct partial_proto *partial;
int i;
missing_extern_C_count++;
#endif
- fn = lookup_std_proto (fname, fname_length);
+ fn = lookup_std_proto ((const char *) NODE_NAME (fname->val.node),
+ NODE_LEN (fname->val.node));
/* Remove the function from the list of required function. */
if (fn)
/* If the partial prototype was included from some other file,
we don't need to patch it up (in this run). */
- i = strlen (file_seen);
+ i = strlen (cur_file);
if (i < inc_filename_length
- || strcmp (inc_filename, file_seen + (i - inc_filename_length)) != 0)
+ || strcmp (inc_filename, cur_file + (i - inc_filename_length)) != 0)
return;
if (fn == NULL)
partial_count++;
partial = (struct partial_proto *)
obstack_alloc (&scan_file_obstack, sizeof (struct partial_proto));
- partial->fname = obstack_alloc (&scan_file_obstack, fname_length + 1);
- bcopy (fname, partial->fname, fname_length);
- partial->fname[fname_length] = 0;
- partial->rtype = obstack_alloc (&scan_file_obstack, rtype_length + 1);
- sprintf (partial->rtype, "%.*s", rtype_length, rtype);
- partial->line_seen = line_seen;
+ partial->line_seen = line;
partial->fn = fn;
fn->partial = partial;
partial->next = partial_proto_list;
if (verbose)
{
fprintf (stderr, "(%s: %s non-prototype function declaration.)\n",
- inc_filename, partial->fname);
+ inc_filename, fn->fname);
}
}
}
static void
+cb_file_change (pfile, map)
+ cpp_reader *pfile ATTRIBUTE_UNUSED;
+ const struct line_map *map;
+{
+ /* Just keep track of current file name. */
+ cur_file = map->to_file;
+}
+
+static void
read_scan_file (in_fname, argc, argv)
char *in_fname;
int argc;
char **argv;
{
- cpp_reader scan_in;
+ cpp_reader *scan_in;
+ cpp_callbacks *cb;
+ cpp_options *options;
struct fn_decl *fn;
int i;
- register struct symbol_list *cur_symbols;
+ struct symbol_list *cur_symbols;
obstack_init (&scan_file_obstack);
- cpp_reader_init (&scan_in);
+ scan_in = cpp_create_reader (CLK_GNUC89);
+ cb = cpp_get_callbacks (scan_in);
+ cb->file_change = cb_file_change;
+
/* We are going to be scanning a header file out of its proper context,
so ignore warnings and errors. */
- CPP_OPTION (&scan_in, inhibit_warnings) = 1;
- CPP_OPTION (&scan_in, inhibit_errors) = 1;
- i = cpp_handle_options (&scan_in, argc, argv);
- if (i < argc && ! CPP_FATAL_ERRORS (&scan_in))
- cpp_fatal (&scan_in, "Invalid option `%s'", argv[i]);
- if (CPP_FATAL_ERRORS (&scan_in))
+ options = cpp_get_options (scan_in);
+ options->inhibit_warnings = 1;
+ options->inhibit_errors = 1;
+
+ i = cpp_handle_options (scan_in, argc, argv);
+ if (i < argc && ! CPP_FATAL_ERRORS (scan_in))
+ cpp_fatal (scan_in, "Invalid option `%s'", argv[i]);
+ cpp_post_options (scan_in);
+ if (CPP_FATAL_ERRORS (scan_in))
exit (FATAL_EXIT_CODE);
- if (! cpp_start_read (&scan_in, 0, in_fname))
+ if (! cpp_read_main_file (scan_in, in_fname, NULL))
exit (FATAL_EXIT_CODE);
+ cpp_finish_options (scan_in);
+
/* We are scanning a system header, so mark it as such. */
- cpp_make_system_header (&scan_in, CPP_BUFFER (&scan_in), 1);
+ cpp_make_system_header (scan_in, 1, 0);
- scan_decls (&scan_in, argc, argv);
+ scan_decls (scan_in, argc, argv);
for (cur_symbols = &symbol_table[0]; cur_symbols->names; cur_symbols++)
- check_macro_names (&scan_in, cur_symbols->names);
-
- if (verbose && (scan_in.errors + warnings) > 0)
- fprintf (stderr, "(%s: %d errors and %d warnings from cpp)\n",
- inc_filename, scan_in.errors, warnings);
- if (scan_in.errors)
- exit (SUCCESS_EXIT_CODE);
+ check_macro_names (scan_in, cur_symbols->names);
/* Traditionally, getc and putc are defined in terms of _filbuf and _flsbuf.
If so, those functions are also required. */
&& (fn = lookup_std_proto ("_filbuf", 7)) != NULL)
{
static const unsigned char getchar_call[] = "getchar();";
- int old_written = CPP_WRITTEN (&scan_in);
int seen_filbuf = 0;
- cpp_buffer *buf = CPP_BUFFER (&scan_in);
- if (cpp_push_buffer (&scan_in, getchar_call,
- sizeof(getchar_call) - 1) == NULL)
- return;
/* Scan the macro expansion of "getchar();". */
+ cpp_push_buffer (scan_in, getchar_call, sizeof(getchar_call) - 1,
+ /* from_stage3 */ true, 1);
for (;;)
{
- enum cpp_ttype token = cpp_get_token (&scan_in);
- int length = CPP_WRITTEN (&scan_in) - old_written;
- unsigned char *id = scan_in.token_buffer + old_written;
-
- CPP_SET_WRITTEN (&scan_in, old_written);
- if (token == CPP_EOF && CPP_BUFFER (&scan_in) == buf)
+ const cpp_token *t = cpp_get_token (scan_in);
+
+ if (t->type == CPP_EOF)
break;
- if (token == CPP_NAME && cpp_idcmp (id, length, "_filbuf") == 0)
+ else if (cpp_ideq (t, "_filbuf"))
seen_filbuf++;
}
+
if (seen_filbuf)
{
int need_filbuf = !SEEN (fn) && !REQUIRED (fn);
{
struct fn_decl *fn;
const char *cptr;
- register struct symbol_list *cur_symbols;
+ struct symbol_list *cur_symbols;
if (required_unseen_count)
{
/* In the case of memmove, protect in case the application
defines it as a macro before including the header. */
if (!strcmp (fn->fname, "memmove")
+ || !strcmp (fn->fname, "putc")
+ || !strcmp (fn->fname, "getc")
|| !strcmp (fn->fname, "vprintf")
|| !strcmp (fn->fname, "vfprintf")
|| !strcmp (fn->fname, "vsprintf")
static int
inf_scan_ident (s, c)
- register sstring *s;
+ sstring *s;
int c;
{
s->ptr = s->base;
- if (ISALPHA (c) || c == '_')
+ if (ISIDST (c))
{
for (;;)
{
SSTRING_PUT (s, c);
c = INF_GET ();
- if (c == EOF || !(ISALNUM (c) || c == '_'))
+ if (c == EOF || !(ISIDNUM (c)))
break;
}
}
}
else if (!strcmp (buf.base, "define"))
{
- if (if_nesting != 1)
- goto skip_to_eol;
c = inf_skip_spaces (c);
c = inf_scan_ident (&buf, c);
if (buf.base[0] > 0 && strcmp (buf.base, protect_name) == 0)
int endif_line;
long to_read;
long int inf_size;
- register struct symbol_list *cur_symbols;
+ struct symbol_list *cur_symbols;
if (argv[0] && argv[0][0])
{
- register char *p;
+ char *p;
progname = 0;
for (p = argv[0]; *p; p++)
}
inf_size = sbuf.st_size;
inf_buffer = (char *) xmalloc (inf_size + 2);
- inf_buffer[inf_size] = '\n';
- inf_buffer[inf_size + 1] = '\0';
- inf_limit = inf_buffer + inf_size;
inf_ptr = inf_buffer;
to_read = inf_size;
close (inf_fd);
+ /* Inf_size may have changed if read was short (as on VMS) */
+ inf_buffer[inf_size] = '\n';
+ inf_buffer[inf_size + 1] = '\0';
+ inf_limit = inf_buffer + inf_size;
+
/* If file doesn't end with '\n', add one. */
if (inf_limit > inf_buffer && inf_limit[-1] != '\n')
inf_limit++;
c = INF_GET ();
if (c == EOF)
break;
- if (ISALPHA (c) || c == '_')
+ if (ISIDST (c))
{
c = inf_scan_ident (&buf, c);
(void) INF_UNGET (c);
static void
fatal VPARAMS ((const char *str, ...))
{
-#ifndef ANSI_PROTOTYPES
- const char *str;
-#endif
- va_list ap;
-
- VA_START(ap, str);
-
-#ifndef ANSI_PROTOTYPES
- str = va_arg (ap, const char *);
-#endif
+ VA_OPEN (ap, str);
+ VA_FIXEDARG (ap, const char *, str);
- v_fatal(str, ap);
- va_end(ap);
+ v_fatal (str, ap);
+ VA_CLOSE (ap);
}
OSDN Git Service
