Fortran, typeprint: Fix wrong indentation when ptype nested structures.

Level of indentation was not proper handled when printing
the elements type's name.

Before:
type = Type t1
integer(kind=4) :: var_1
integer(kind=4) :: var_2
End Type t1

After:
type = Type t1
    integer(kind=4) :: var_1
    integer(kind=4) :: var_2
End Type t1

2016-05-25  Bernhard Heckel  <bernhard.heckel@intel.com>

gdb/Changelog:
	* f-typeprint.c (f_type_print_base): Take print level into account.

gdb/testsuite/Changelog:
	* gdb.fortran/print_type.exp: Fix expected output.
	* gdb.fortran/whatis_type.exp: Fix expected output.
This commit is contained in:
Bernhard Heckel 2016-05-25 08:47:16 +02:00
parent 3cd81d8df7
commit 72b1705502
4 changed files with 14 additions and 5 deletions

View File

@ -1,3 +1,7 @@
2016-05-25 Bernhard Heckel <bernhard.heckel@intel.com>
* f-typeprint.c (f_type_print_base): Take print level into account.
2016-05-24 Tom Tromey <tom@tromey.com>
PR python/17386:

View File

@ -288,7 +288,7 @@ 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);
fprintfi_filtered (level, stream, "%s", TYPE_NAME (type));
return;
}

View File

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

View File

@ -40,14 +40,14 @@ set t1_r "$real :: t1_r"
gdb_test "whatis t1" \
[multi_line "type = Type t1" \
"$t1_i" \
"$t1_r" \
" $t1_i" \
" $t1_r" \
"End Type t1"] \
"whatis t1"
gdb_test "whatis t1v" \
[multi_line "type = Type t1" \
"$t1_i" \
"$t1_r" \
" $t1_i" \
" $t1_r" \
"End Type t1"] \
"whatis t1v"