PR c++/43790

[pf3gnuchains/gcc-fork.git] / gcc / gencheck.c

diff --git a/gcc/gencheck.c b/gcc/gencheck.c
index 8041b64..0d1907c 100644 (file)
--- a/gcc/gencheck.c
+++ b/gcc/gencheck.c
@@ -1,11 +1,12 @@
 /* Generate check macros for tree codes.
 /* Generate check macros for tree codes.

-   Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, 2007, 2008
+   Free Software Foundation, Inc.

 
 This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
 
 This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

-Software Foundation; either version 2, or (at your option) any later
+Software Foundation; either version 3, or (at your option) any later

 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY
 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY


@@ -14,40 +15,37 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License

-along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */

 
 #include "bconfig.h"
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
 
 
 #include "bconfig.h"
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
 

-#define DEFTREECODE(SYM, NAME, TYPE, LEN)   STRINGX(SYM),
+#define DEFTREECODE(SYM, NAME, TYPE, LEN) #SYM,
+#define END_OF_BASE_TREE_CODES

 
 static const char *const tree_codes[] = {
 
 static const char *const tree_codes[] = {

-#include "tree.def"
-#include "c-common.def"
-#include "gencheck.h"
+#include "all-tree.def"

 (char*) 0
 };
 
 (char*) 0
 };
 

-static void usage PARAMS ((void));
+#undef DEFTREECODE
+#undef END_OF_BASE_TREE_CODES
+
+static void usage (void);

 
 static void
 
 static void

-usage ()
+usage (void)

 {
   fputs ("Usage: gencheck\n", stderr);
 }
 
 {
   fputs ("Usage: gencheck\n", stderr);
 }
 

-extern int main PARAMS ((int, char **));
-

 int
 int

-main (argc, argv)
-     int argc;
-     char **argv ATTRIBUTE_UNUSED;
+main (int argc, char ** ARG_UNUSED (argv))

 {
 {

-  int i;
+  int i, j;

 
   switch (argc)
     {
 
   switch (argc)
     {


@@ -63,10 +61,18 @@ main (argc, argv)
   puts ("#ifndef GCC_TREE_CHECK_H");
   puts ("#define GCC_TREE_CHECK_H\n");
 
   puts ("#ifndef GCC_TREE_CHECK_H");
   puts ("#define GCC_TREE_CHECK_H\n");
 

+  /* Print macros for checks based on each of the tree code names.  However,
+     since we include the tree nodes from all languages, we must check
+     for duplicate names to avoid defining the same macro twice.  */

   for (i = 0; tree_codes[i]; i++)
     {
   for (i = 0; tree_codes[i]; i++)
     {

-      printf ("#define %s_CHECK(t)\tTREE_CHECK (t, %s)\n",
-             tree_codes[i], tree_codes[i]);
+      for (j = 0; j < i; j++)
+       if (strcmp (tree_codes[i], tree_codes[j]) == 0)
+         break;
+
+      if (i == j)
+       printf ("#define %s_CHECK(t)\tTREE_CHECK (t, %s)\n",
+               tree_codes[i], tree_codes[i]);

     }
 
   puts ("\n#endif /* GCC_TREE_CHECK_H */");
     }
 
   puts ("\n#endif /* GCC_TREE_CHECK_H */");