Replace bsearch with a std::lower_bound-based search

[deliverable/binutils-gdb.git] / gdb / ada-typeprint.c

diff --git a/gdb/ada-typeprint.c b/gdb/ada-typeprint.c
index 4502b81a741f9db048865912d1219492ce3f2f71..c2461660ad4aff9553b41fd1172d2e3e4ccfe42f 100644 (file)
--- a/gdb/ada-typeprint.c
+++ b/gdb/ada-typeprint.c
@@ -17,28 +17,24 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Standard C includes.  */
-#include <ctype.h>
-
-/* Local non-gdb includes.  */
-#include "ada-lang.h"
-#include "bfd.h"
-#include "c-lang.h"
-#include "cli/cli-style.h"
-#include "command.h"
-#include "demangle.h"
-#include "expression.h"
 #include "gdb_obstack.h"
-#include "gdbcmd.h"
-#include "gdbcore.h"
-#include "gdbtypes.h"
-#include "language.h"
+#include "bfd.h"               /* Binary File Description */
 #include "symtab.h"
-#include "target-float.h"
+#include "gdbtypes.h"
+#include "expression.h"
+#include "value.h"
+#include "gdbcore.h"
 #include "target.h"
+#include "command.h"
+#include "gdbcmd.h"
+#include "language.h"
+#include "demangle.h"
+#include "c-lang.h"
+#include "cli/cli-style.h"
 #include "typeprint.h"
-#include "value.h"
+#include "target-float.h"
+#include "ada-lang.h"
+#include <ctype.h>
 
 static int print_selected_record_field_types (struct type *, struct type *,
                                              int, int,
@@ -167,12 +163,12 @@ print_range (struct type *type, struct ui_file *stream,
        LONGEST lo = 0, hi = 0; /* init for gcc -Wall */
        int got_error = 0;
 
-       TRY
+       try
          {
            lo = ada_discrete_type_low_bound (type);
            hi = ada_discrete_type_high_bound (type);
          }
-       CATCH (e, RETURN_MASK_ERROR)
+       catch (const gdb_exception_error &e)
          {
            /* This can happen when the range is dynamic.  Sometimes,
               resolving dynamic property values requires us to have
@@ -182,7 +178,6 @@ print_range (struct type *type, struct ui_file *stream,
            fprintf_filtered (stream, "<>");
            got_error = 1;
          }
-       END_CATCH
 
        if (!got_error)
          {
@@ -398,7 +393,8 @@ print_array_type (struct type *type, struct ui_file *stream, int show,
 
   if (type == NULL)
     {
-      fprintf_filtered (stream, _("<undecipherable array type>"));
+      fprintf_styled (stream, metadata_style.style (),
+                     _("<undecipherable array type>"));
       return;
     }
 
@@ -843,7 +839,7 @@ ada_print_type (struct type *type0, const char *varstring,
       if (is_var_decl)
        fprintf_filtered (stream, "%.*s: ",
                          ada_name_prefix_len (varstring), varstring);
-      fprintf_filtered (stream, "<null type?>");
+      fprintf_styled (stream, metadata_style.style (), "<null type?>");
       return;
     }
 
@@ -899,8 +895,9 @@ ada_print_type (struct type *type0, const char *varstring,
            const char *name = ada_type_name (type);
 
            if (!ada_is_range_type_name (name))
-             fprintf_filtered (stream, _("<%s-byte integer>"),
-                               pulongest (TYPE_LENGTH (type)));
+             fprintf_styled (stream, metadata_style.style (),
+                             _("<%s-byte integer>"),
+                             pulongest (TYPE_LENGTH (type)));
            else
              {
                fprintf_filtered (stream, "range ");
@@ -921,8 +918,9 @@ ada_print_type (struct type *type0, const char *varstring,
          }
        break;
       case TYPE_CODE_FLT:
-       fprintf_filtered (stream, _("<%s-byte float>"),
-                         pulongest (TYPE_LENGTH (type)));
+       fprintf_styled (stream, metadata_style.style (),
+                       _("<%s-byte float>"),
+                       pulongest (TYPE_LENGTH (type)));
        break;
       case TYPE_CODE_ENUM:
        if (show < 0)