Daily bump.

[pf3gnuchains/gcc-fork.git] / gcc / tree-browser.c

diff --git a/gcc/tree-browser.c b/gcc/tree-browser.c
index 891c761..0c3eba0 100644 (file)
--- a/gcc/tree-browser.c
+++ b/gcc/tree-browser.c
@@ -1,5 +1,5 @@
 /* Tree browser.
-   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
    Contributed by Sebastian Pop <s.pop@laposte.net>
 
 This file is part of GCC.
@@ -16,14 +16,13 @@ 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.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "errors.h"
 #include "tree.h"
 #include "tree-inline.h"
 #include "diagnostic.h"
@@ -53,11 +52,7 @@ struct tb_command {
 };
 
 #define DEFTBCODE(code, str, help) { help, str, sizeof(str) - 1, code },
-#ifdef HOST_EBCDIC
-static struct tb_command tb_commands[] =
-#else
 static const struct tb_command tb_commands[] =
-#endif
 {
 #include "tree-browser.def"
 };
@@ -77,11 +72,7 @@ struct tb_tree_code {
 };
 
 #define DEFTREECODE(SYM, STRING, TYPE, NARGS) { SYM, STRING, sizeof (STRING) - 1 },
-#ifdef HOST_EBCDIC
-static struct tb_tree_code tb_tree_codes[] =
-#else
 static const struct tb_tree_code tb_tree_codes[] =
-#endif
 {
 #include "tree.def"
 };
@@ -262,14 +253,14 @@ browse_tree (tree begin)
          break;
 
        case TB_REFERENCE_TO_THIS:
-         if (head && TREE_CODE_CLASS (TREE_CODE (head)) == 't')
+         if (head && TYPE_P (head))
            TB_SET_HEAD (TYPE_REFERENCE_TO (head));
          else
            TB_WF;
          break;
 
        case TB_POINTER_TO_THIS:
-         if (head && TREE_CODE_CLASS (TREE_CODE (head)) == 't')
+         if (head && TYPE_P (head))
            TB_SET_HEAD (TYPE_POINTER_TO (head));
          else
            TB_WF;
@@ -309,8 +300,7 @@ browse_tree (tree begin)
          break;
 
        case TB_DOMAIN:
-         if (head && (TREE_CODE (head) == ARRAY_TYPE
-                      || TREE_CODE (head) == SET_TYPE))
+         if (head && TREE_CODE (head) == ARRAY_TYPE)
            TB_SET_HEAD (TYPE_DOMAIN (head));
          else
            TB_WF;
@@ -323,13 +313,6 @@ browse_tree (tree begin)
            TB_WF;
          break;
 
-       case TB_ARG_TYPE_AS_WRITTEN:
-         if (head && TREE_CODE (head) == PARM_DECL)
-           TB_SET_HEAD (DECL_ARG_TYPE_AS_WRITTEN (head));
-         else
-           TB_WF;
-         break;
-
        case TB_ARG_TYPE:
          if (head && TREE_CODE (head) == PARM_DECL)
            TB_SET_HEAD (DECL_ARG_TYPE (head));
@@ -338,28 +321,28 @@ browse_tree (tree begin)
          break;
 
        case TB_INITIAL:
-         if (head && TREE_CODE_CLASS (TREE_CODE (head)) == 'd')
+         if (head && DECL_P (head))
            TB_SET_HEAD (DECL_INITIAL (head));
          else
            TB_WF;
          break;
 
        case TB_RESULT:
-         if (head && TREE_CODE_CLASS (TREE_CODE (head)) == 'd')
+         if (head && DECL_P (head))
            TB_SET_HEAD (DECL_RESULT_FLD (head));
          else
            TB_WF;
          break;
 
        case TB_ARGUMENTS:
-         if (head && TREE_CODE_CLASS (TREE_CODE (head)) == 'd')
+         if (head && DECL_P (head))
            TB_SET_HEAD (DECL_ARGUMENTS (head));
          else
            TB_WF;
          break;
 
        case TB_ABSTRACT_ORIGIN:
-         if (head && TREE_CODE_CLASS (TREE_CODE (head)) == 'd')
+         if (head && DECL_P (head))
            TB_SET_HEAD (DECL_ABSTRACT_ORIGIN (head));
          else if (head && TREE_CODE (head) == BLOCK)
            TB_SET_HEAD (BLOCK_ABSTRACT_ORIGIN (head));
@@ -368,18 +351,18 @@ browse_tree (tree begin)
          break;
 
        case TB_ATTRIBUTES:
-         if (head && TREE_CODE_CLASS (TREE_CODE (head)) == 'd')
+         if (head && DECL_P (head))
            TB_SET_HEAD (DECL_ATTRIBUTES (head));
-         else if (head && TREE_CODE_CLASS (TREE_CODE (head)) == 't')
+         else if (head && TYPE_P (head))
            TB_SET_HEAD (TYPE_ATTRIBUTES (head));
          else
            TB_WF;
          break;
 
        case TB_CONTEXT:
-         if (head && TREE_CODE_CLASS (TREE_CODE (head)) == 'd')
+         if (head && DECL_P (head))
            TB_SET_HEAD (DECL_CONTEXT (head));
-         else if (head && TREE_CODE_CLASS (TREE_CODE (head)) == 't'
+         else if (head && TYPE_P (head)
                   && TYPE_CONTEXT (head))
            TB_SET_HEAD (TYPE_CONTEXT (head));
          else
@@ -401,18 +384,18 @@ browse_tree (tree begin)
           break;
 
        case TB_UNIT_SIZE:
-         if (head && TREE_CODE_CLASS (TREE_CODE (head)) == 'd')
+         if (head && DECL_P (head))
            TB_SET_HEAD (DECL_SIZE_UNIT (head));
-         else if (head && TREE_CODE_CLASS (TREE_CODE (head)) == 't')
+         else if (head && TYPE_P (head))
            TB_SET_HEAD (TYPE_SIZE_UNIT (head));
          else
            TB_WF;
          break;
 
        case TB_SIZE:
-         if (head && TREE_CODE_CLASS (TREE_CODE (head)) == 'd')
+         if (head && DECL_P (head))
            TB_SET_HEAD (DECL_SIZE (head));
-         else if (head && TREE_CODE_CLASS (TREE_CODE (head)) == 't')
+         else if (head && TYPE_P (head))
            TB_SET_HEAD (TYPE_SIZE (head));
          else
            TB_WF;
@@ -441,32 +424,28 @@ browse_tree (tree begin)
          break;
 
        case TB_CHILD_0:
-         if (head && IS_EXPR_CODE_CLASS (TREE_CODE_CLASS (TREE_CODE (head)))
-             && TREE_OPERAND (head, 0))
+         if (head && EXPR_P (head) && TREE_OPERAND (head, 0))
            TB_SET_HEAD (TREE_OPERAND (head, 0));
          else
            TB_WF;
          break;
 
        case TB_CHILD_1:
-          if (head && IS_EXPR_CODE_CLASS (TREE_CODE_CLASS (TREE_CODE (head)))
-             && TREE_OPERAND (head, 1))
+          if (head && EXPR_P (head) && TREE_OPERAND (head, 1))
            TB_SET_HEAD (TREE_OPERAND (head, 1));
          else
            TB_WF;
           break;
 
        case TB_CHILD_2:
-          if (head && IS_EXPR_CODE_CLASS (TREE_CODE_CLASS (TREE_CODE (head)))
-             && TREE_OPERAND (head, 2))
+          if (head && EXPR_P (head) && TREE_OPERAND (head, 2))
            TB_SET_HEAD (TREE_OPERAND (head, 2));
          else
            TB_WF;
          break;
 
        case TB_CHILD_3:
-         if (head && IS_EXPR_CODE_CLASS (TREE_CODE_CLASS (TREE_CODE (head)))
-             && TREE_OPERAND (head, 3))
+         if (head && EXPR_P (head) && TREE_OPERAND (head, 3))
            TB_SET_HEAD (TREE_OPERAND (head, 3));
          else
            TB_WF;
@@ -751,7 +730,7 @@ store_child_info (tree *tp, int *walk_subtrees ATTRIBUTE_UNUSED,
   node = *tp;
 
   /* 'node' is the parent of 'TREE_OPERAND (node, *)'.  */
-  if (TREE_CODE_CLASS (TREE_CODE (node)) == 'e')
+  if (EXPRESSION_CLASS_P (node))
     {
 
 #define STORE_CHILD(N) do {                                                \
@@ -808,7 +787,7 @@ TB_parent_eq (const void *p1, const void *p2)
   if (p1 == NULL || p2 == NULL)
     return 0;
 
-  if (TREE_CODE_CLASS(TREE_CODE(parent)) == 'e')
+  if (EXPRESSION_CLASS_P (parent))
     {
 
 #define TEST_CHILD(N) do {               \