Patches from David Mosberger, and a patch to make bootstrap work.

[pf3gnuchains/gcc-fork.git] / gcc / fix-header.c

diff --git a/gcc/fix-header.c b/gcc/fix-header.c
index b01f656..3740ce0 100644 (file)
--- a/gcc/fix-header.c
+++ b/gcc/fix-header.c
@@ -1,5 +1,6 @@
 /* fix-header.c - Make C header file suitable for C++.
-   Copyright (C) 1993, 94-99, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998,
+   1999, 2000 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
@@ -75,7 +76,6 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "obstack.h"
 #include "scan.h"
 #include "cpplib.h"
-#include "cpphash.h"
 
 static void v_fatal PARAMS ((const char *, va_list)) ATTRIBUTE_NORETURN;
 static void fatal PARAMS ((const char *, ...)) ATTRIBUTE_PRINTF_1 ATTRIBUTE_NORETURN;
@@ -381,7 +381,7 @@ lookup_std_proto (name, name_length)
      const char *name;
      int name_length;
 {
-  int i = hashf (name, name_length, HASH_SIZE);
+  int i = hashstr (name, name_length) % HASH_SIZE;
   int i0 = i;
   for (;;)
     {
@@ -569,7 +569,7 @@ recognized_function (fname, fname_length,
 
   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,
@@ -602,11 +602,13 @@ check_macro_names (pfile, names)
      cpp_reader *pfile;
      namelist names;
 {
+  size_t len;
   while (*names)
     {
-      if (cpp_lookup (pfile, names, -1, -1))
+      len = strlen (names);
+      if (cpp_defined (pfile, names, len))
        recognized_macro (names);
-      names += strlen (names) + 1;
+      names += len + 1;
     }
 }
 
@@ -617,7 +619,6 @@ read_scan_file (in_fname, argc, argv)
      char **argv;
 {
   cpp_reader scan_in;
-  cpp_options scan_options;
   struct fn_decl *fn;
   int i;
   register struct symbol_list *cur_symbols;
@@ -625,17 +626,21 @@ read_scan_file (in_fname, argc, argv)
   obstack_init (&scan_file_obstack); 
 
   cpp_reader_init (&scan_in);
-  scan_in.opts = &scan_options;
-  cpp_options_init (&scan_options);
+  /* 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))
     exit (FATAL_EXIT_CODE);
 
-  if (! cpp_start_read (&scan_in, in_fname))
+  if (! cpp_start_read (&scan_in, 0, in_fname))
     exit (FATAL_EXIT_CODE);
-  CPP_OPTIONS (&scan_in)->no_line_commands = 1;
+
+  /* We are scanning a system header, so mark it as such.  */
+  CPP_BUFFER (&scan_in)->system_header_p = 1;
 
   scan_decls (&scan_in, argc, argv);
   for (cur_symbols = &symbol_table[0]; cur_symbols->names; cur_symbols++)
@@ -653,26 +658,24 @@ read_scan_file (in_fname, argc, argv)
       && (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);
       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();".  */
       for (;;)
        {
-         enum cpp_token token = cpp_get_token (&scan_in);
+         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) /* Should not happen ...  */
+         if (token == CPP_EOF && CPP_BUFFER (&scan_in) == buf)
            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)
+         if (token == CPP_NAME && cpp_idcmp (id, length, "_filbuf") == 0)
            seen_filbuf++;
        }
       if (seen_filbuf)
@@ -690,7 +693,7 @@ read_scan_file (in_fname, argc, argv)
                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";