OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Bernhard Heckel 2016-05-25 08:47:17 +02:00
parent 72b1705502
commit 9b2db1fd27
4 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gdb/ChangeLog
View File

@ -1,3 +1,7 @@
2016-05-25 Bernhard Heckel <bernhard.heckel@intel.com>
* f-typeprint.c (f_type_print_base): Don't print fields when show < 0.
2016-05-25 Bernhard Heckel <bernhard.heckel@intel.com>
* f-typeprint.c (f_type_print_base): Take print level into account.

27
gdb/f-typeprint.c
View File

@ -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:

4
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2016-05-25 Bernhard Heckel <bernhard.heckel@intel.com>
* gdb.fortran/whatis_type.exp: Adapt expected output.
2016-05-25 Bernhard Heckel <bernhard.heckel@intel.com>
* gdb.fortran/print_type.exp: Fix expected output.

14
gdb/testsuite/gdb.fortran/whatis_type.exp
View File

@ -38,18 +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"] \
"whatis t1"
gdb_test "whatis t1v" \
[multi_line "type = Type t1" \
" $t1_i" \
" $t1_r" \
"End Type t1"] \
"whatis t1v"
gdb_test "whatis t1" "type = Type t1"
gdb_test "whatis t1v" "type = Type t1"
gdb_test "ptype t1" \
[multi_line "type = Type t1" \