gdb/fortran: Introduce fortran-operator.def file

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

diff --git a/gdb/f-typeprint.c b/gdb/f-typeprint.c
index 920c21fbcf03fc4c61571ba653499b7e96769f3d..a0e34b3058ddcc6b67560999b19b19cfaf221f70 100644 (file)
--- a/gdb/f-typeprint.c
+++ b/gdb/f-typeprint.c
@@ -1,6 +1,6 @@
 /* Support for printing Fortran types for GDB, the GNU debugger.
 
-   Copyright (C) 1986-2016 Free Software Foundation, Inc.
+   Copyright (C) 1986-2019 Free Software Foundation, Inc.
 
    Contributed by Motorola.  Adapted from the C version by Farooq Butt
    (fmbutt@engage.sps.mot.com).
@@ -52,7 +52,6 @@ f_print_type (struct type *type, const char *varstring, struct ui_file *stream,
              int show, int level, const struct type_print_options *flags)
 {
   enum type_code code;
-  int demangled_args;
 
   if (type_not_associated (type))
     {
@@ -81,12 +80,15 @@ f_print_type (struct type *type, const char *varstring, struct ui_file *stream,
 
   if (varstring != NULL)
     {
+      int demangled_args;
+
       fputs_filtered (varstring, stream);
 
       /* For demangled function names, we have the arglist as part of the name,
          so don't print an additional pair of ()'s.  */
 
-      demangled_args = varstring[strlen (varstring) - 1] == ')'; 
+      demangled_args = (*varstring != '\0'
+                       && varstring[strlen (varstring) - 1] == ')');
       f_type_print_varspec_suffix (type, stream, show, 0, demangled_args, 0);
    }
 }
@@ -159,8 +161,6 @@ f_type_print_varspec_suffix (struct type *type, struct ui_file *stream,
                             int show, int passed_a_ptr, int demangled_args,
                             int arrayprint_recurse_level)
 {
-  int upper_bound, lower_bound;
-
   /* No static variables are permitted as an error call may occur during
      execution of this function.  */
 
@@ -190,9 +190,10 @@ f_type_print_varspec_suffix (struct type *type, struct ui_file *stream,
             f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0,
                                         0, 0, arrayprint_recurse_level);
 
-          lower_bound = f77_get_lowerbound (type);
+          LONGEST lower_bound = f77_get_lowerbound (type);
+
           if (lower_bound != 1)        /* Not the default.  */
-            fprintf_filtered (stream, "%d:", lower_bound);
+            fprintf_filtered (stream, "%s:", plongest (lower_bound));
 
           /* Make sure that, if we have an assumed size array, we
              print out a warning and print the upperbound as '*'.  */
@@ -201,8 +202,9 @@ f_type_print_varspec_suffix (struct type *type, struct ui_file *stream,
             fprintf_filtered (stream, "*");
           else
             {
-              upper_bound = f77_get_upperbound (type);
-              fprintf_filtered (stream, "%d", upper_bound);
+              LONGEST upper_bound = f77_get_upperbound (type);
+
+              fputs_filtered (plongest (upper_bound), stream);
             }
 
           if (TYPE_CODE (TYPE_TARGET_TYPE (type)) != TYPE_CODE_ARRAY)
@@ -271,7 +273,6 @@ void
 f_type_print_base (struct type *type, struct ui_file *stream, int show,
                   int level)
 {
-  int upper_bound;
   int index;
 
   QUIT;
@@ -288,7 +289,12 @@ f_type_print_base (struct type *type, struct ui_file *stream, int show,
 
   if ((show <= 0) && (TYPE_NAME (type) != NULL))
     {
-      fprintfi_filtered (level, stream, "%s", TYPE_NAME (type));
+      const char *prefix = "";
+      if (TYPE_CODE (type) == TYPE_CODE_UNION)
+       prefix = "Type, C_Union :: ";
+      else if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
+       prefix = "Type ";
+      fprintfi_filtered (level, stream, "%s%s", prefix, TYPE_NAME (type));
       return;
     }
 
@@ -302,18 +308,23 @@ f_type_print_base (struct type *type, struct ui_file *stream, int show,
       break;
 
     case TYPE_CODE_ARRAY:
-    case TYPE_CODE_FUNC:
       f_type_print_base (TYPE_TARGET_TYPE (type), stream, show, level);
       break;
+    case TYPE_CODE_FUNC:
+      if (TYPE_TARGET_TYPE (type) == NULL)
+       type_print_unknown_return_type (stream);
+      else
+       f_type_print_base (TYPE_TARGET_TYPE (type), stream, show, level);
+      break;
 
     case TYPE_CODE_PTR:
-      fprintf_filtered (stream, "PTR TO -> ( ");
-      f_type_print_base (TYPE_TARGET_TYPE (type), stream, show, level);
+      fprintfi_filtered (level, stream, "PTR TO -> ( ");
+      f_type_print_base (TYPE_TARGET_TYPE (type), stream, show, 0);
       break;
 
     case TYPE_CODE_REF:
-      fprintf_filtered (stream, "REF TO -> ( ");
-      f_type_print_base (TYPE_TARGET_TYPE (type), stream, show, level);
+      fprintfi_filtered (level, stream, "REF TO -> ( ");
+      f_type_print_base (TYPE_TARGET_TYPE (type), stream, show, 0);
       break;
 
     case TYPE_CODE_VOID:
@@ -352,8 +363,9 @@ f_type_print_base (struct type *type, struct ui_file *stream, int show,
        fprintfi_filtered (level, stream, "character*(*)");
       else
        {
-         upper_bound = f77_get_upperbound (type);
-         fprintf_filtered (stream, "character*%d", upper_bound);
+         LONGEST upper_bound = f77_get_upperbound (type);
+
+         fprintf_filtered (stream, "character*%s", pulongest (upper_bound));
        }
       break;
 
@@ -363,7 +375,7 @@ f_type_print_base (struct type *type, struct ui_file *stream, int show,
        fprintfi_filtered (level, stream, "Type, C_Union :: ");
       else
        fprintfi_filtered (level, stream, "Type ");
-      fputs_filtered (TYPE_TAG_NAME (type), stream);
+      fputs_filtered (TYPE_NAME (type), stream);
       /* According to the definition,
          we only print structure elements in case show > 0.  */
       if (show > 0)
@@ -380,12 +392,12 @@ f_type_print_base (struct type *type, struct ui_file *stream, int show,
              fputs_filtered ("\n", stream);
            }
          fprintfi_filtered (level, stream, "End Type ");
-         fputs_filtered (TYPE_TAG_NAME (type), stream);
+         fputs_filtered (TYPE_NAME (type), stream);
        }
       break;
 
     case TYPE_CODE_MODULE:
-      fprintfi_filtered (level, stream, "module %s", TYPE_TAG_NAME (type));
+      fprintfi_filtered (level, stream, "module %s", TYPE_NAME (type));
       break;
 
     default_case: