diff mbox series

[1/3] Boolify ada_identical_enum_types_p

Message ID 20240906-ada-enum-stuff-v1-1-9d0fb5ac86bd@adacore.com
State New
Headers
Series Minor fixes to ada_identical_enum_types_p |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gdb_build--master-aarch64 success Build passed
linaro-tcwg-bot/tcwg_gdb_build--master-arm success Build passed
linaro-tcwg-bot/tcwg_gdb_check--master-aarch64 success Test passed

Commit Message

Tom Tromey Sept. 6, 2024, 3:54 p.m. UTC 
  This changes ada_identical_enum_types_p to return bool rather than
int.
---
 gdb/ada-lang.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

Comments

Tom de Vries Sept. 7, 2024, 2:08 a.m. UTC | #1 
On 9/6/24 17:54, Tom Tromey wrote:
> This changes ada_identical_enum_types_p to return bool rather than
> int.

LGTM.

Approved-By: Tom de Vries <tdevries@suse.de>

Thanks,
- Tom

> ---
>   gdb/ada-lang.c | 13 +++++++------
>   1 file changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
> index d77fa3c54b8..9710ca5f224 100644
> --- a/gdb/ada-lang.c
> +++ b/gdb/ada-lang.c
> @@ -201,7 +201,8 @@ static symbol_name_matcher_ftype *ada_get_symbol_name_matcher
>   static int symbols_are_identical_enums
>     (const std::vector<struct block_symbol> &syms);
>   
> -static int ada_identical_enum_types_p (struct type *type1, struct type *type2);
> +static bool ada_identical_enum_types_p (struct type *type1,
> +					struct type *type2);
>   
>   
>   /* The character set used for source files.  */
> @@ -4965,14 +4966,14 @@ is_nondebugging_type (struct type *type)
>     return (name != NULL && strcmp (name, "<variable, no debug info>") == 0);
>   }
>   
> -/* Return nonzero if TYPE1 and TYPE2 are two enumeration types
> +/* Return true if TYPE1 and TYPE2 are two enumeration types
>      that are deemed "identical" for practical purposes.
>   
>      This function assumes that TYPE1 and TYPE2 are both TYPE_CODE_ENUM
>      types and that their number of enumerals is identical (in other
>      words, type1->num_fields () == type2->num_fields ()).  */
>   
> -static int
> +static bool
>   ada_identical_enum_types_p (struct type *type1, struct type *type2)
>   {
>     int i;
> @@ -4985,7 +4986,7 @@ ada_identical_enum_types_p (struct type *type1, struct type *type2)
>     /* All enums in the type should have an identical underlying value.  */
>     for (i = 0; i < type1->num_fields (); i++)
>       if (type1->field (i).loc_enumval () != type2->field (i).loc_enumval ())
> -      return 0;
> +      return false;
>   
>     /* All enumerals should also have the same name (modulo any numerical
>        suffix).  */
> @@ -4999,10 +5000,10 @@ ada_identical_enum_types_p (struct type *type1, struct type *type2)
>         ada_remove_trailing_digits (name_1, &len_1);
>         ada_remove_trailing_digits (name_2, &len_2);
>         if (len_1 != len_2 || strncmp (name_1, name_2, len_1) != 0)
> -	return 0;
> +	return false;
>       }
>   
> -  return 1;
> +  return true;
>   }
>   
>   /* Return nonzero if all the symbols in SYMS are all enumeral symbols
>
diff mbox series

Patch

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index d77fa3c54b8..9710ca5f224 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -201,7 +201,8 @@  static symbol_name_matcher_ftype *ada_get_symbol_name_matcher
 static int symbols_are_identical_enums
   (const std::vector<struct block_symbol> &syms);
 
-static int ada_identical_enum_types_p (struct type *type1, struct type *type2);
+static bool ada_identical_enum_types_p (struct type *type1,
+					struct type *type2);
 
 
 /* The character set used for source files.  */
@@ -4965,14 +4966,14 @@  is_nondebugging_type (struct type *type)
   return (name != NULL && strcmp (name, "<variable, no debug info>") == 0);
 }
 
-/* Return nonzero if TYPE1 and TYPE2 are two enumeration types
+/* Return true if TYPE1 and TYPE2 are two enumeration types
    that are deemed "identical" for practical purposes.
 
    This function assumes that TYPE1 and TYPE2 are both TYPE_CODE_ENUM
    types and that their number of enumerals is identical (in other
    words, type1->num_fields () == type2->num_fields ()).  */
 
-static int
+static bool
 ada_identical_enum_types_p (struct type *type1, struct type *type2)
 {
   int i;
@@ -4985,7 +4986,7 @@  ada_identical_enum_types_p (struct type *type1, struct type *type2)
   /* All enums in the type should have an identical underlying value.  */
   for (i = 0; i < type1->num_fields (); i++)
     if (type1->field (i).loc_enumval () != type2->field (i).loc_enumval ())
-      return 0;
+      return false;
 
   /* All enumerals should also have the same name (modulo any numerical
      suffix).  */
@@ -4999,10 +5000,10 @@  ada_identical_enum_types_p (struct type *type1, struct type *type2)
       ada_remove_trailing_digits (name_1, &len_1);
       ada_remove_trailing_digits (name_2, &len_2);
       if (len_1 != len_2 || strncmp (name_1, name_2, len_1) != 0)
-	return 0;
+	return false;
     }
 
-  return 1;
+  return true;
 }
 
 /* Return nonzero if all the symbols in SYMS are all enumeral symbols