gdb: remove TYPE_INDEX_TYPE macro

[deliverable/binutils-gdb.git] / gdb / c-varobj.c

diff --git a/gdb/c-varobj.c b/gdb/c-varobj.c
index 51940b9dd667c3cf65e3984b46abef72745f753a..362fd79c89b4fa0a4064f8ed53b97a6eae798cae 100644 (file)
--- a/gdb/c-varobj.c
+++ b/gdb/c-varobj.c
@@ -164,7 +164,7 @@ c_is_path_expr_parent (const struct varobj *var)
            {
              const char *field_name;
 
-             gdb_assert (var->index < TYPE_NFIELDS (parent_type));
+             gdb_assert (var->index < parent_type->num_fields ());
              field_name = TYPE_FIELD_NAME (parent_type, var->index);
              return !(field_name == NULL || *field_name == '\0');
            }
@@ -202,7 +202,7 @@ c_number_of_children (const struct varobj *var)
 
     case TYPE_CODE_STRUCT:
     case TYPE_CODE_UNION:
-      children = TYPE_NFIELDS (type);
+      children = type->num_fields ();
       break;
 
     case TYPE_CODE_PTR:
@@ -254,7 +254,7 @@ value_struct_element_index (struct value *value, int type_index)
 
   try
     {
-      if (field_is_static (&TYPE_FIELD (type, type_index)))
+      if (field_is_static (&type->field (type_index)))
        result = value_static_field (type, type_index);
       else
        result = value_primitive_field (value, 0, type_index, type);
@@ -307,12 +307,12 @@ c_describe_child (const struct varobj *parent, int index,
     case TYPE_CODE_ARRAY:
       if (cname)
        *cname = int_string (index
-                            + TYPE_LOW_BOUND (TYPE_INDEX_TYPE (type)),
+                            + TYPE_LOW_BOUND (type->index_type ()),
                             10, 1, 0, 0);
 
       if (cvalue && value)
        {
-         int real_index = index + TYPE_LOW_BOUND (TYPE_INDEX_TYPE (type));
+         int real_index = index + TYPE_LOW_BOUND (type->index_type ());
 
          try
            {
@@ -330,7 +330,7 @@ c_describe_child (const struct varobj *parent, int index,
        *cfull_expression = 
          string_printf ("(%s)[%s]", parent_expression.c_str (),
                         int_string (index
-                                    + TYPE_LOW_BOUND (TYPE_INDEX_TYPE (type)),
+                                    + TYPE_LOW_BOUND (type->index_type ()),
                                     10, 1, 0, 0));
 
 
@@ -649,7 +649,7 @@ cplus_class_num_children (struct type *type, int children[3])
   children[v_protected] = 0;
 
   vptr_fieldno = get_vptr_fieldno (type, &basetype);
-  for (i = TYPE_N_BASECLASSES (type); i < TYPE_NFIELDS (type); i++)
+  for (i = TYPE_N_BASECLASSES (type); i < type->num_fields (); i++)
     {
       /* If we have a virtual table pointer, omit it.  Even if virtual
         table pointers are not specifically marked in the debug info,