X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Ff-typeprint.c;h=72a4188fbb9130bd1e3817cc432c79b85df7d0d1;hb=abb78b78c4184d2ac968362229adae268385a21c;hp=590ed73d32fa0e85d37fd7b0c1b4f1d6ef86d1d9;hpb=f168693bc9d109c387e442119354bd57ecec8267;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/f-typeprint.c b/gdb/f-typeprint.c index 590ed73d32..72a4188fbb 100644 --- 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-2015 Free Software Foundation, Inc. + Copyright (C) 1986-2020 Free Software Foundation, Inc. Contributed by Motorola. Adapted from the C version by Farooq Butt (fmbutt@engage.sps.mot.com). @@ -30,13 +30,15 @@ #include "gdbcore.h" #include "target.h" #include "f-lang.h" +#include "typeprint.h" +#include "cli/cli-style.h" #if 0 /* Currently unused. */ static void f_type_print_args (struct type *, struct ui_file *); #endif static void f_type_print_varspec_suffix (struct type *, struct ui_file *, int, - int, int, int); + int, int, int, bool); void f_type_print_varspec_prefix (struct type *, struct ui_file *, int, int); @@ -44,6 +46,16 @@ void f_type_print_varspec_prefix (struct type *, struct ui_file *, void f_type_print_base (struct type *, struct ui_file *, int, int); +/* See documentation in f-lang.h. */ + +void +f_print_typedef (struct type *type, struct symbol *new_symbol, + struct ui_file *stream) +{ + type = check_typedef (type); + f_print_type (type, "", stream, 0, 0, &type_print_raw_options); +} + /* LEVEL is the depth to indent lines by. */ void @@ -51,30 +63,39 @@ 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; f_type_print_base (type, stream, show, level); code = TYPE_CODE (type); if ((varstring != NULL && *varstring != '\0') - /* Need a space if going to print stars or brackets; - but not if we will print just a type name. */ - || ((show > 0 || TYPE_NAME (type) == 0) - && (code == TYPE_CODE_PTR || code == TYPE_CODE_FUNC + /* Need a space if going to print stars or brackets; but not if we + will print just a type name. */ + || ((show > 0 + || TYPE_NAME (type) == 0) + && (code == TYPE_CODE_FUNC || code == TYPE_CODE_METHOD || code == TYPE_CODE_ARRAY - || code == TYPE_CODE_REF))) + || ((code == TYPE_CODE_PTR + || code == TYPE_CODE_REF) + && (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_FUNC + || (TYPE_CODE (TYPE_TARGET_TYPE (type)) + == TYPE_CODE_METHOD) + || (TYPE_CODE (TYPE_TARGET_TYPE (type)) + == TYPE_CODE_ARRAY)))))) fputs_filtered (" ", stream); f_type_print_varspec_prefix (type, stream, show, 0); 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] == ')'; - f_type_print_varspec_suffix (type, stream, show, 0, demangled_args, 0); + demangled_args = (*varstring != '\0' + && varstring[strlen (varstring) - 1] == ')'); + f_type_print_varspec_suffix (type, stream, show, 0, demangled_args, 0, false); } } @@ -139,15 +160,18 @@ f_type_print_varspec_prefix (struct type *type, struct ui_file *stream, /* 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. */ + Args work like c_type_print_varspec_prefix. + + PRINT_RANK_ONLY is true when TYPE is an array which should be printed + without the upper and lower bounds being specified, this will occur + when the array is not allocated or not associated and so there are no + known upper or lower bounds. */ static void 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 arrayprint_recurse_level, bool print_rank_only) { - int upper_bound, lower_bound; - /* No static variables are permitted as an error call may occur during execution of this function. */ @@ -167,28 +191,53 @@ f_type_print_varspec_suffix (struct type *type, struct ui_file *stream, if (arrayprint_recurse_level == 1) 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, - arrayprint_recurse_level); - - lower_bound = f77_get_lowerbound (type); - if (lower_bound != 1) /* Not the default. */ - fprintf_filtered (stream, "%d:", lower_bound); + if (type_not_associated (type)) + print_rank_only = true; + else if (type_not_allocated (type)) + print_rank_only = true; + else if ((TYPE_ASSOCIATED_PROP (type) + && PROP_CONST != TYPE_DYN_PROP_KIND (TYPE_ASSOCIATED_PROP (type))) + || (TYPE_ALLOCATED_PROP (type) + && PROP_CONST != TYPE_DYN_PROP_KIND (TYPE_ALLOCATED_PROP (type))) + || (TYPE_DATA_LOCATION (type) + && PROP_CONST != TYPE_DYN_PROP_KIND (TYPE_DATA_LOCATION (type)))) + { + /* This case exist when we ptype a typename which has the dynamic + properties but cannot be resolved as there is no object. */ + print_rank_only = true; + } - /* Make sure that, if we have an assumed size array, we - print out a warning and print the upperbound as '*'. */ + if (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_ARRAY) + f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0, + 0, 0, arrayprint_recurse_level, + print_rank_only); - if (TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED (type)) - fprintf_filtered (stream, "*"); + if (print_rank_only) + fprintf_filtered (stream, ":"); else { - upper_bound = f77_get_upperbound (type); - fprintf_filtered (stream, "%d", upper_bound); + LONGEST lower_bound = f77_get_lowerbound (type); + if (lower_bound != 1) /* Not the default. */ + 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 '*'. */ + + if (TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED (type)) + fprintf_filtered (stream, "*"); + else + { + LONGEST upper_bound = f77_get_upperbound (type); + + fputs_filtered (plongest (upper_bound), stream); + } } if (TYPE_CODE (TYPE_TARGET_TYPE (type)) != TYPE_CODE_ARRAY) - f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0, 0, 0, - arrayprint_recurse_level); + f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0, + 0, 0, arrayprint_recurse_level, + print_rank_only); + if (arrayprint_recurse_level == 1) fprintf_filtered (stream, ")"); else @@ -199,17 +248,35 @@ f_type_print_varspec_suffix (struct type *type, struct ui_file *stream, case TYPE_CODE_PTR: case TYPE_CODE_REF: f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0, 1, 0, - arrayprint_recurse_level); - fprintf_filtered (stream, ")"); + arrayprint_recurse_level, false); + fprintf_filtered (stream, " )"); break; case TYPE_CODE_FUNC: - f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0, - passed_a_ptr, 0, arrayprint_recurse_level); - if (passed_a_ptr) + { + int i, nfields = TYPE_NFIELDS (type); + + f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0, + passed_a_ptr, 0, + arrayprint_recurse_level, false); + if (passed_a_ptr) + fprintf_filtered (stream, ") "); + fprintf_filtered (stream, "("); + if (nfields == 0 && TYPE_PROTOTYPED (type)) + f_print_type (builtin_f_type (get_type_arch (type))->builtin_void, + "", stream, -1, 0, 0); + else + for (i = 0; i < nfields; i++) + { + if (i > 0) + { + fputs_filtered (", ", stream); + wrap_here (" "); + } + f_print_type (TYPE_FIELD_TYPE (type, i), "", stream, -1, 0, 0); + } fprintf_filtered (stream, ")"); - - fprintf_filtered (stream, "()"); + } break; case TYPE_CODE_UNDEF: @@ -251,7 +318,6 @@ void f_type_print_base (struct type *type, struct ui_file *stream, int show, int level) { - int upper_bound; int index; QUIT; @@ -259,7 +325,7 @@ f_type_print_base (struct type *type, struct ui_file *stream, int show, wrap_here (" "); if (type == NULL) { - fputs_filtered ("", stream); + fputs_styled ("", metadata_style.style (), stream); return; } @@ -268,7 +334,12 @@ f_type_print_base (struct type *type, struct ui_file *stream, int show, if ((show <= 0) && (TYPE_NAME (type) != NULL)) { - fputs_filtered (TYPE_NAME (type), stream); + 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; } @@ -282,22 +353,31 @@ 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, 0, 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, 0, level); + fprintfi_filtered (level, stream, "REF TO -> ( "); + f_type_print_base (TYPE_TARGET_TYPE (type), stream, show, 0); break; case TYPE_CODE_VOID: - fprintfi_filtered (level, stream, "VOID"); + { + gdbarch *gdbarch = get_type_arch (type); + struct type *void_type = builtin_f_type (gdbarch)->builtin_void; + fprintfi_filtered (level, stream, "%s", TYPE_NAME (void_type)); + } break; case TYPE_CODE_UNDEF: @@ -332,8 +412,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; @@ -343,24 +424,29 @@ 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 ("\n", stream); - for (index = 0; index < TYPE_NFIELDS (type); index++) + fputs_filtered (TYPE_NAME (type), stream); + /* According to the definition, + we only print structure elements in case show > 0. */ + if (show > 0) { - f_type_print_base (TYPE_FIELD_TYPE (type, index), stream, show, - level + 4); - fputs_filtered (" :: ", stream); - fputs_filtered (TYPE_FIELD_NAME (type, index), stream); - f_type_print_varspec_suffix (TYPE_FIELD_TYPE (type, index), - stream, 0, 0, 0, 0); fputs_filtered ("\n", stream); - } - fprintfi_filtered (level, stream, "End Type "); - fputs_filtered (TYPE_TAG_NAME (type), stream); + for (index = 0; index < TYPE_NFIELDS (type); index++) + { + f_type_print_base (TYPE_FIELD_TYPE (type, index), stream, + show - 1, level + 4); + fputs_filtered (" :: ", stream); + fputs_filtered (TYPE_FIELD_NAME (type, index), stream); + f_type_print_varspec_suffix (TYPE_FIELD_TYPE (type, index), + stream, show - 1, 0, 0, 0, false); + fputs_filtered ("\n", stream); + } + fprintfi_filtered (level, stream, "End Type "); + 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: @@ -375,4 +461,7 @@ f_type_print_base (struct type *type, struct ui_file *stream, int show, error (_("Invalid type code (%d) in symbol table."), TYPE_CODE (type)); break; } + + if (TYPE_IS_ALLOCATABLE (type)) + fprintf_filtered (stream, ", allocatable"); }