[PATCH 2/4] Fortran, typeprint: Take level of details into account when printing elements of a structure.

Bernhard Heckel
2016-05-10T14:16:26Z

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-09 Bernhard Heckel <bernhard.heckel@intel.com>

gdb/Changelog:
* f-typeprint.c (f_type_print_base): Don't print structure fields when show is <= -1.

gdb/testsuite/Changelog:
* gdb.fortran/whatis_type.exp: Adapt expected output.

---
gdb/f-typeprint.c | 27 ++++++++++++++++-----------
gdb/testsuite/gdb.fortran/whatis_type.exp | 13 ++-----------
2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/gdb/f-typeprint.c b/gdb/f-typeprint.c
index 1990e1b..49f374a 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 - 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, 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:
diff --git a/gdb/testsuite/gdb.fortran/whatis_type.exp b/gdb/testsuite/gdb.fortran/whatis_type.exp
index edaf4fd..2caebe6 100644
--- a/gdb/testsuite/gdb.fortran/whatis_type.exp
+++ b/gdb/testsuite/gdb.fortran/whatis_type.exp
@@ -38,17 +38,8 @@ gdb_continue_to_breakpoint "bp1"
set t1_i "$int :: t1_i"
set t1_r "$real :: t1_r"

-gdb_test "whatis t1" \
- [multi_line "type = Type t1" \
- " $t1_i" \
- " $t1_r" \
- "End Type t1"]
-
-gdb_test "whatis t1v" \
- [multi_line "type = Type t1" \
- " $t1_i" \
- " $t1_r" \
- "End Type t1"]
+gdb_test "whatis t1" "type = Type t1"
+gdb_test "whatis t1v" "type = Type t1"

gdb_test "ptype t1" \
[multi_line "type = Type t1" \
--
2.7.1.339.g0233b80