From a5ad232b3e6f39cf2955a8ec3aa4355359a9f72e Mon Sep 17 00:00:00 2001 From: Frank Penczek Date: Fri, 8 Sep 2017 15:11:47 +0200 Subject: [PATCH] Fix indentation for printing Fortran types with pointers Printing the prefix "PTR TO -> (" resp. "REF TO ->(" ignored the active indentation level. This caused inconsistent appearance of user-defined Fortran types containing pointers. Fix by using "fprintfi_filtered" with the current indentation level for outputting the prefix string. Add test case ptr-indentation. Example using 'ptype' on object of type: type TypeWithPointer integer i integer, pointer:: p end type TypeWithPointer Before: type = Type typewithpointer integer(kind=4) :: i PTR TO -> ( integer(kind=4) :: p) End Type typewithpointer After: type = Type typewithpointer integer(kind=4) :: i PTR TO -> ( integer(kind=4) :: p) End Type typewithpointer --- gdb/ChangeLog | 7 ++++ gdb/f-typeprint.c | 8 ++-- gdb/testsuite/ChangeLog | 7 ++++ gdb/testsuite/gdb.fortran/ptr-indentation.exp | 41 +++++++++++++++++++ gdb/testsuite/gdb.fortran/ptr-indentation.f90 | 30 ++++++++++++++ 5 files changed, 89 insertions(+), 4 deletions(-) create mode 100644 gdb/testsuite/gdb.fortran/ptr-indentation.exp create mode 100644 gdb/testsuite/gdb.fortran/ptr-indentation.f90 diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0d0296e81da..f201b18dcae 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2017-09-08 Frank Penczek + Christoph Weinmann + Bernhard Heckel + + * f-typeprint.c (f_type_print_base): Use fprintfi_filtered + to maintain proper indentation when printing pointers/refs. + 2017-09-07 Joel Brobecker GDB 8.0.1 released. diff --git a/gdb/f-typeprint.c b/gdb/f-typeprint.c index 2a858aab171..9d9a1f30b9f 100644 --- a/gdb/f-typeprint.c +++ b/gdb/f-typeprint.c @@ -314,13 +314,13 @@ f_type_print_base (struct type *type, struct ui_file *stream, int show, break; case TYPE_CODE_PTR: - fprintf_filtered (stream, "PTR TO -> ( "); - f_type_print_base (TYPE_TARGET_TYPE (type), stream, show, level); + fprintfi_filtered (level, stream, "PTR TO -> ( "); + f_type_print_base (TYPE_TARGET_TYPE (type), stream, show, 0); break; case TYPE_CODE_REF: - fprintf_filtered (stream, "REF TO -> ( "); - f_type_print_base (TYPE_TARGET_TYPE (type), stream, show, level); + fprintfi_filtered (level, stream, "REF TO -> ( "); + f_type_print_base (TYPE_TARGET_TYPE (type), stream, show, 0); break; case TYPE_CODE_VOID: diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 62d929c8374..198fe783512 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2017-09-08 Frank Penczek + Christoph Weinmann + Bernhard Heckel + + * gdb.fortran/ptr-indentation.f90: New file. + * gdb.fortran/ptr-indentation.exp: New file. + 2017-09-05 Tom Tromey PR gdb/22010: diff --git a/gdb/testsuite/gdb.fortran/ptr-indentation.exp b/gdb/testsuite/gdb.fortran/ptr-indentation.exp new file mode 100644 index 00000000000..ea510f1c334 --- /dev/null +++ b/gdb/testsuite/gdb.fortran/ptr-indentation.exp @@ -0,0 +1,41 @@ +# Copyright 2017 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +if {[skip_fortran_tests]} { return -1 } + +standard_testfile .f90 +load_lib fortran.exp + +if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug f90}]} { + return -1 +} + +if {![runto MAIN__]} then { + untested "couldn't run to breakpoint MAIN__" + return -1 +} + +set int [fortran_int4] +set real [fortran_real4] + +gdb_breakpoint [gdb_get_line_number "BP1"] +gdb_continue_to_breakpoint "BP1" + +# Check the indentation when using ptype on pointers in user-defined types. +gdb_test "ptype tinsta" \ + [multi_line "type = Type tuserdef" \ + " $int :: i" \ + " PTR TO -> \\( $real :: ptr\\)" \ + "End Type tuserdef"] diff --git a/gdb/testsuite/gdb.fortran/ptr-indentation.f90 b/gdb/testsuite/gdb.fortran/ptr-indentation.f90 new file mode 100644 index 00000000000..045f5efd6aa --- /dev/null +++ b/gdb/testsuite/gdb.fortran/ptr-indentation.f90 @@ -0,0 +1,30 @@ +! Copyright 2017 Free Software Foundation, Inc. +! +! This program is free software; you can redistribute it and/or modify +! it under the terms of the GNU General Public License as published by +! the Free Software Foundation; either version 3 of the License, or +! (at your option) any later version. +! +! This program is distributed in the hope that it will be useful, +! but WITHOUT ANY WARRANTY; without even the implied warranty of +! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +! GNU General Public License for more details. +! +! You should have received a copy of the GNU General Public License +! along with this program. If not, see . + +program main + implicit none + + type tuserdef + integer :: i + real, pointer :: ptr + end type tuserdef + real, target :: rval + + type(tuserdef), target:: tinsta,tinstb,tinstc + + tinsta%i = 4 + tinsta%ptr => rval !BP1 + +end program main -- 2.30.2