#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 cpp_file_change *));
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)
return;
- if (fn->params[0] == '\0' || strcmp (fn->params, "void") == 0)
+ if (fn->params[0] == '\0')
return;
/* We only have a partial function declaration,
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);
}
}
cpp_reader *pfile;
namelist names;
{
+ size_t len;
while (*names)
{
- if (cpp_defined (pfile, names, -1))
+ len = strlen (names);
+ if (cpp_defined (pfile, (const unsigned char *)names, len))
recognized_macro (names);
- names += strlen (names) + 1;
+ names += len + 1;
}
}
static void
+cb_file_change (pfile, fc)
+ cpp_reader *pfile ATTRIBUTE_UNUSED;
+ const cpp_file_change *fc;
+{
+ /* Just keep track of current file name. */
+ cur_file = fc->to.filename;
+}
+
+static void
read_scan_file (in_fname, argc, argv)
char *in_fname;
int argc;
char **argv;
{
- cpp_reader scan_in;
- cpp_options scan_options;
+ cpp_reader* scan_in;
+ cpp_callbacks *cb;
+ cpp_options *options;
struct fn_decl *fn;
int i;
register struct symbol_list *cur_symbols;
obstack_init (&scan_file_obstack);
- cpp_reader_init (&scan_in);
- scan_in.opts = &scan_options;
- cpp_options_init (&scan_options);
+ scan_in = cpp_create_reader (NULL, 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. */
- scan_options.inhibit_warnings = 1;
- scan_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]);
- 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, in_fname))
+ if (! cpp_start_read (scan_in, in_fname))
exit (FATAL_EXIT_CODE);
- CPP_OPTIONS (&scan_in)->no_line_commands = 1;
- 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);
+ /* We are scanning a system header, so mark it as such. */
+ cpp_make_system_header (scan_in, 1, 0);
- 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);
+ 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);
/* Traditionally, getc and putc are defined in terms of _filbuf and _flsbuf.
If so, those functions are also required. */
if (special_file_handling == stdio_h
&& (fn = lookup_std_proto ("_filbuf", 7)) != NULL)
{
- static char getchar_call[] = "getchar();";
- cpp_buffer *buf
- = cpp_push_buffer (&scan_in, getchar_call, sizeof(getchar_call) - 1);
- int old_written = CPP_WRITTEN (&scan_in);
+ static const unsigned char getchar_call[] = "getchar();";
int seen_filbuf = 0;
/* Scan the macro expansion of "getchar();". */
+ cpp_push_buffer (scan_in, getchar_call, sizeof(getchar_call) - 1,
+ BUF_BUILTIN, in_fname);
for (;;)
{
- enum cpp_token token = cpp_get_token (&scan_in);
- int length = CPP_WRITTEN (&scan_in) - old_written;
- CPP_SET_WRITTEN (&scan_in, old_written);
- if (token == CPP_EOF) /* Should not happen ... */
+ cpp_token t;
+
+ cpp_get_token (scan_in, &t);
+ if (t.type == CPP_EOF)
break;
- if (token == CPP_POP && CPP_BUFFER (&scan_in) == buf)
- {
- cpp_pop_buffer (&scan_in);
- break;
- }
- if (token == CPP_NAME && length == 7
- && strcmp ("_filbuf", scan_in.token_buffer + old_written) == 0)
+ else if (cpp_ideq (&t, "_filbuf"))
seen_filbuf++;
}
+ cpp_pop_buffer (scan_in);
+
if (seen_filbuf)
{
int need_filbuf = !SEEN (fn) && !REQUIRED (fn);
SET_REQUIRED (fn);
if (need_flsbuf)
SET_REQUIRED (flsbuf_fn);
- if (need_flsbuf + need_filbuf == 2)
+ if (need_flsbuf && need_filbuf)
new_list = "_filbuf\0_flsbuf\0";
else if (need_flsbuf)
new_list = "_flsbuf\0";
/* 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")
}
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)
#endif
va_list ap;
- VA_START(ap, str);
+ VA_START (ap, str);
#ifndef ANSI_PROTOTYPES
str = va_arg (ap, const char *);
#endif
- v_fatal(str, ap);
- va_end(ap);
+ v_fatal (str, ap);
+ va_end (ap);
}
OSDN Git Service
