+2000-12-04 Neil Booth <neilb@earthling.net>
+
+ * cppfiles.c (cpp_make_system_header): Take 2 booleans,
+ and operate on current buffer.
+ (cpp_read_file): Rename _cpp_read_file.
+ * cpplib.c (do_line, do_pragma_system_header): Update calls to
+ cpp_make_system_header.
+ * fix-header.c: Similarly.
+ * cpphash.h (_cpp_read_file): Move from...
+ * cpplib.h: ... here.
+ * cppinit.c (do_includes, cpp_start_read): Update appropriately.
+
2000-12-03 Kaveh R. Ghazi <ghazi@teal.rutgers.edu>
* builtins.c (expand_builtin_strspn, expand_builtin_strcspn):
see the details of struct include_file. This is an exported interface
because fix-header needs it. */
void
-cpp_make_system_header (pfile, pbuf, flag)
+cpp_make_system_header (pfile, syshdr, externc)
cpp_reader *pfile;
- cpp_buffer *pbuf;
- int flag;
+ int syshdr, externc;
{
- if (flag < 0 || flag > 2)
- cpp_ice (pfile, "cpp_make_system_header: bad flag %d\n", flag);
- else if (!pbuf->inc)
- cpp_ice (pfile, "cpp_make_system_header called on non-file buffer");
- else
- pbuf->inc->sysp = flag;
+ int flags = 0;
+
+ /* 1 = system header, 2 = system header to be treated as C. */
+ if (syshdr)
+ flags = 1 + (externc != 0);
+ pfile->buffer->inc->sysp = flags;
}
/* Report on all files that might benefit from a multiple include guard.
/* Push an input buffer and load it up with the contents of FNAME.
If FNAME is "" or NULL, read standard input. */
int
-cpp_read_file (pfile, fname)
+_cpp_read_file (pfile, fname)
cpp_reader *pfile;
const char *fname;
{
/* In cppfiles.c */
extern void _cpp_simplify_pathname PARAMS ((char *));
+extern int _cpp_read_file PARAMS ((cpp_reader *, const char *));
extern void _cpp_execute_include PARAMS ((cpp_reader *,
const cpp_token *, int,
struct file_name_list *));
/* Later: maybe update this to use the #include "" search path
if cpp_read_file fails. */
- if (cpp_read_file (pfile, p->arg) && scan)
+ if (_cpp_read_file (pfile, p->arg) && scan)
cpp_scan_buffer_nooutput (pfile, 0);
q = p->next;
free (p);
if (CPP_OPTION (pfile, out_fname) == NULL)
CPP_OPTION (pfile, out_fname) = "";
- if (!cpp_read_file (pfile, fname))
+ if (!_cpp_read_file (pfile, fname))
return 0;
initialize_dependency_output (pfile);
if (action_number == 1)
{
reason = FC_ENTER;
- cpp_make_system_header (pfile, buffer, 0);
+ cpp_make_system_header (pfile, 0, 0);
read_line_number (pfile, &action_number);
}
else if (action_number == 2)
{
reason = FC_LEAVE;
- cpp_make_system_header (pfile, buffer, 0);
+ cpp_make_system_header (pfile, 0, 0);
read_line_number (pfile, &action_number);
}
if (action_number == 3)
{
- cpp_make_system_header (pfile, buffer, 1);
+ cpp_make_system_header (pfile, 1, 0);
read_line_number (pfile, &action_number);
}
if (action_number == 4)
{
- cpp_make_system_header (pfile, buffer, 2);
+ cpp_make_system_header (pfile, 1, 1);
read_line_number (pfile, &action_number);
}
}
do_pragma_system_header (pfile)
cpp_reader *pfile;
{
- cpp_buffer *ip = CPP_BUFFER (pfile);
- if (CPP_PREV_BUFFER (ip) == NULL)
- cpp_warning (pfile, "#pragma system_header outside include file");
+ cpp_buffer *buffer = pfile->buffer;
+
+ if (buffer->prev == 0)
+ cpp_warning (pfile, "#pragma system_header ignored outside include file");
else
- cpp_make_system_header (pfile, ip, 1);
+ cpp_make_system_header (pfile, 1, 0);
check_eol (pfile);
}
/* In cppfiles.c */
extern int cpp_included PARAMS ((cpp_reader *, const char *));
-extern int cpp_read_file PARAMS ((cpp_reader *, const char *));
-extern void cpp_make_system_header PARAMS ((cpp_reader *, cpp_buffer *, int));
+extern void cpp_make_system_header PARAMS ((cpp_reader *, int, int));
/* These are inline functions instead of macros so we can get type
checking. */
exit (FATAL_EXIT_CODE);
/* 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);
for (cur_symbols = &symbol_table[0]; cur_symbols->names; cur_symbols++)