forked from Imagelibrary/binutils-gdb
gdb: remove TYPE_NFIELDS macro
Remove `TYPE_NFIELDS`, changing all the call sites to use `type::num_fields` directly. This is quite a big diff, but this was mostly done using sed and coccinelle. A few call sites were done by hand. gdb/ChangeLog: * gdbtypes.h (TYPE_NFIELDS): Remove. Change all cal sites to use type::num_fields instead. Change-Id: Ib73be4c36f9e770e0f729bac3b5257d7cb2f9591
This commit is contained in:
@@ -295,11 +295,11 @@ evaluate_struct_tuple (struct value *struct_val,
|
||||
|
||||
fieldno++;
|
||||
/* Skip static fields. */
|
||||
while (fieldno < TYPE_NFIELDS (struct_type)
|
||||
while (fieldno < struct_type->num_fields ()
|
||||
&& field_is_static (&TYPE_FIELD (struct_type,
|
||||
fieldno)))
|
||||
fieldno++;
|
||||
if (fieldno >= TYPE_NFIELDS (struct_type))
|
||||
if (fieldno >= struct_type->num_fields ())
|
||||
error (_("too many initializers"));
|
||||
field_type = TYPE_FIELD_TYPE (struct_type, fieldno);
|
||||
if (field_type->code () == TYPE_CODE_UNION
|
||||
@@ -1058,7 +1058,7 @@ evaluate_funcall (type *expect_type, expression *exp, int *pos,
|
||||
type = TYPE_TARGET_TYPE (type);
|
||||
if (type && type->code () == TYPE_CODE_FUNC)
|
||||
{
|
||||
for (; tem <= nargs && tem <= TYPE_NFIELDS (type); tem++)
|
||||
for (; tem <= nargs && tem <= type->num_fields (); tem++)
|
||||
{
|
||||
argvec[tem] = evaluate_subexp (TYPE_FIELD_TYPE (type,
|
||||
tem - 1),
|
||||
|
||||
Reference in New Issue
Block a user