Removed superflous code.

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

diff --git a/gdb/f-typeprint.c b/gdb/f-typeprint.c
index 58558e4b5d609df0b042503764a0c693b5869c0d..4bca773ffc327f1fedca026e0488b6997a36e185 100644 (file)
--- a/gdb/f-typeprint.c
+++ b/gdb/f-typeprint.c
@@ -17,7 +17,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "defs.h"
 #include "obstack.h"
@@ -36,10 +36,14 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "typeprint.h"
 #include "frame.h"  /* ??? */
 
-#include <string.h>
+#include "gdb_string.h"
 #include <errno.h>
 
+#if 0  /* Currently unused */
 static void f_type_print_args PARAMS ((struct type *, FILE *));
+#endif
+
+static void print_equivalent_f77_float_type PARAMS ((struct type *, FILE *));
 
 static void f_type_print_varspec_suffix PARAMS ((struct type *, FILE *,
                                                 int, int, int));
@@ -144,12 +148,15 @@ f_type_print_varspec_prefix (type, stream, show, passed_a_ptr)
     case TYPE_CODE_MEMBER:
     case TYPE_CODE_REF:
     case TYPE_CODE_COMPLEX:
+    case TYPE_CODE_TYPEDEF:
       /* These types need no prefix.  They are listed here so that
         gcc -Wall will reveal any types that haven't been handled.  */
       break;
     }
 }
 
+#if 0  /* Currently unused */
+
 static void
 f_type_print_args (type, stream)
      struct type *type;
@@ -184,6 +191,8 @@ f_type_print_args (type, stream)
   fprintf_filtered (stream, ")");
 }
 
+#endif /* 0 */
+
 /* Print any array sizes, function arguments or close parentheses
    needed after the variable name (to describe its type).
    Args work like c_type_print_varspec_prefix.  */
@@ -216,8 +225,9 @@ f_type_print_varspec_suffix (type, stream, show, passed_a_ptr, demangled_args)
 
       if (arrayprint_recurse_level == 1)
        fprintf_filtered(stream,"(");
-      else
-       fprintf_filtered(stream,",");
+
+      if (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_ARRAY)
+       f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0, 0, 0);
 
       retcode = f77_get_dynamic_lowerbound (type,&lower_bound);
 
@@ -251,9 +261,12 @@ f_type_print_varspec_suffix (type, stream, show, passed_a_ptr, demangled_args)
             fprintf_filtered(stream,"%d",upper_bound);
         }
 
-      f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0, 0, 0);
+      if (TYPE_CODE (TYPE_TARGET_TYPE (type)) != TYPE_CODE_ARRAY)
+       f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0, 0, 0);
       if (arrayprint_recurse_level == 1)
        fprintf_filtered (stream, ")");
+      else
+       fprintf_filtered(stream,",");
       arrayprint_recurse_level--;
       break;
 
@@ -289,13 +302,14 @@ f_type_print_varspec_suffix (type, stream, show, passed_a_ptr, demangled_args)
     case TYPE_CODE_METHOD:
     case TYPE_CODE_MEMBER:
     case TYPE_CODE_COMPLEX:
+    case TYPE_CODE_TYPEDEF:
       /* These types do not need a suffix.  They are listed so that
         gcc -Wall will report types that may not have been considered.  */
       break;
     }
 }
 
-void
+static void
 print_equivalent_f77_float_type (type, stream)
      struct type *type;
      FILE *stream;
@@ -304,16 +318,7 @@ print_equivalent_f77_float_type (type, stream)
      appropriate real. XLC stupidly outputs -12 as a type
      for real when it really should be outputting -18 */
 
-  switch (TYPE_LENGTH (type))
-    {
-    case 4:
-      fprintf_filtered (stream, "real*4");
-      break;
-
-    case 8:
-      fprintf_filtered(stream,"real*8");
-      break;
-    }
+  fprintf_filtered (stream, "real*%d", TYPE_LENGTH (type));
 }
 
 /* Print the name of the type (or the ultimate pointer target,
@@ -360,19 +365,23 @@ f_type_print_base (type, stream, show, level)
       return;
     }
 
+  if (TYPE_CODE (type) != TYPE_CODE_TYPEDEF)
+    CHECK_TYPEDEF (type);
+
   switch (TYPE_CODE (type))
     {
-    case TYPE_CODE_ARRAY:
-      f_type_print_base (TYPE_TARGET_TYPE (type), stream, show, level);
+    case TYPE_CODE_TYPEDEF:
+      f_type_print_base (TYPE_TARGET_TYPE (type), stream, 0, level);
       break;
 
+    case TYPE_CODE_ARRAY:
     case TYPE_CODE_FUNC:
       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);
+      f_type_print_base (TYPE_TARGET_TYPE (type), stream, 0, level);
       break;
 
     case TYPE_CODE_VOID:
@@ -409,8 +418,7 @@ f_type_print_base (type, stream, show, level)
       break;
 
     case TYPE_CODE_COMPLEX:
-      fprintf_filtered (stream, "complex*");
-      fprintf_filtered (stream, "%d", TYPE_LENGTH (type));
+      fprintf_filtered (stream, "complex*%d", TYPE_LENGTH (type));
       break;
 
     case TYPE_CODE_FLT:
@@ -421,7 +429,7 @@ f_type_print_base (type, stream, show, level)
       /* Strings may have dynamic upperbounds (lengths) like arrays. */
 
       if (TYPE_ARRAY_UPPER_BOUND_TYPE (type) == BOUND_CANNOT_BE_DETERMINED)
-       fprintf_filtered ("character*(*)");
+       fprintf_filtered (stream, "character*(*)");
       else
        {
          retcode = f77_get_dynamic_upperbound (type, &upper_bound);