aboutsummaryrefslogtreecommitdiff
path: root/gdb/f-typeprint.c
diff options
context:
space:
mode:
authorBernhard Heckel <bernhard.heckel@intel.com>2016-05-25 08:47:17 +0200
committerBernhard Heckel <bernhard.heckel@intel.com>2016-05-25 08:47:17 +0200
commit9b2db1fd27cea1323a7ae0beb9399c8e1c4a3741 (patch)
tree2017d76cdbef6b02c0f71e4ff3f6a14ea4f74825 /gdb/f-typeprint.c
parent72b1705502a891e07d40ad215146c71193920801 (diff)
downloadgdb-9b2db1fd27cea1323a7ae0beb9399c8e1c4a3741.zip
gdb-9b2db1fd27cea1323a7ae0beb9399c8e1c4a3741.tar.gz
gdb-9b2db1fd27cea1323a7ae0beb9399c8e1c4a3741.tar.bz2
Fortran, typeprint: Take level of details into account when printing elements of a structure.
According to the typeprint's description, elements of a structure should not be printed when show is < 1. This variable is also used to distinguish the level of details between "ptype" and "whatis" expressions. Before: (gdb) whatis t1v type = Type t1 integer(kind=4) :: t1_i real(kind=4) :: t1_r End Type t1 After: (gdb) whatis t1v type = Type t1 2016-05-25 Bernhard Heckel <bernhard.heckel@intel.com> gdb/Changelog: * f-typeprint.c (f_type_print_base): Don't print fields when show < 0. gdb/testsuite/Changelog: * gdb.fortran/whatis_type.exp: Adapt expected output.
Diffstat (limited to 'gdb/f-typeprint.c')
-rw-r--r--gdb/f-typeprint.c27
1 files changed, 16 insertions, 11 deletions
diff --git a/gdb/f-typeprint.c b/gdb/f-typeprint.c
index 1990e1b..f38a3a0 100644
--- a/gdb/f-typeprint.c
+++ b/gdb/f-typeprint.c
@@ -364,19 +364,24 @@ f_type_print_base (struct type *type, struct ui_file *stream, int show,
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++)
+ /* 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,
+ 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);
+ }
break;
case TYPE_CODE_MODULE: