Fix latent bug with custom word point completers

[deliverable/binutils-gdb.git] / gdb / f-valprint.c

diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
index 0dea6ba407eedea991b80a79b07d38fa6e71cb2d..264416ec5408e1c763ad40b21af7c8966d854a6d 100644 (file)
--- a/gdb/f-valprint.c
+++ b/gdb/f-valprint.c
@@ -21,20 +21,18 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
-#include "block.h"
-#include "command.h"
-#include "dictionary.h"
+#include "symtab.h"
+#include "gdbtypes.h"
 #include "expression.h"
+#include "value.h"
+#include "valprint.h"
+#include "language.h"
 #include "f-lang.h"
 #include "frame.h"
 #include "gdbcore.h"
-#include "gdbtypes.h"
-#include "language.h"
-#include "symtab.h"
-#include "valprint.h"
-#include "value.h"
+#include "command.h"
+#include "block.h"
+#include "dictionary.h"
 
 static void f77_get_dynamic_length_of_aggregate (struct type *);
 
@@ -201,7 +199,7 @@ static const struct generic_val_print_decorations f_decorations =
   ")",
   ".TRUE.",
   ".FALSE.",
-  "VOID",
+  "void",
   "{",
   "}"
 };
@@ -409,17 +407,17 @@ info_common_command_for_block (const struct block *block, const char *comname,
            printf_filtered ("%s = ",
                             SYMBOL_PRINT_NAME (common->contents[index]));
 
-           TRY
+           try
              {
                val = value_of_variable (common->contents[index], block);
                value_print (val, gdb_stdout, &opts);
              }
 
-           CATCH (except, RETURN_MASK_ERROR)
+           catch (const gdb_exception_error &except)
              {
-               printf_filtered ("<error reading variable: %s>", except.message);
+               printf_filtered ("<error reading variable: %s>",
+                                except.what ());
              }
-           END_CATCH
 
            putchar_filtered ('\n');
          }