diff options
| author | Bernhard Heckel <bernhard.heckel@intel.com> | 2016-05-25 08:47:16 +0200 |
|---|---|---|
| committer | Bernhard Heckel <bernhard.heckel@intel.com> | 2016-05-25 08:47:16 +0200 |
| commit | 72b1705502a891e07d40ad215146c71193920801 (patch) | |
| tree | 430ee1cfd4a8636a14843497b875c92fa57fb2c1 | |
| parent | 3cd81d8df727cc961b9333d5e977718c622bf9c3 (diff) | |
| download | gdb-72b1705502a891e07d40ad215146c71193920801.zip gdb-72b1705502a891e07d40ad215146c71193920801.tar.gz gdb-72b1705502a891e07d40ad215146c71193920801.tar.bz2 | |
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.
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/f-typeprint.c | 2 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.fortran/whatis_type.exp | 8 |
4 files changed, 14 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 00e0ddb..cba01ef 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -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: diff --git a/gdb/f-typeprint.c b/gdb/f-typeprint.c index 32989d4..1990e1b 100644 --- a/gdb/f-typeprint.c +++ b/gdb/f-typeprint.c @@ -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; } diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index c518f15..2b05192 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,10 @@ 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. 2016-05-24 Tom Tromey <tom@tromey.com> diff --git a/gdb/testsuite/gdb.fortran/whatis_type.exp b/gdb/testsuite/gdb.fortran/whatis_type.exp index b6324e6..7265923 100644 --- a/gdb/testsuite/gdb.fortran/whatis_type.exp +++ b/gdb/testsuite/gdb.fortran/whatis_type.exp @@ -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" |