diff options
author | Frank Penczek <frank.penczek@intel.com> | 2017-09-08 15:11:47 +0200 |
---|---|---|
committer | Tim Wiederhake <tim.wiederhake@intel.com> | 2017-09-08 15:11:47 +0200 |
commit | a5ad232b3e6f39cf2955a8ec3aa4355359a9f72e (patch) | |
tree | d9b5fbe52280838ba874a949f016a9895c653766 /gdb/testsuite | |
parent | 1de031c80b121db6f59d189d150ab2b69f6ede21 (diff) | |
download | gdb-a5ad232b3e6f39cf2955a8ec3aa4355359a9f72e.zip gdb-a5ad232b3e6f39cf2955a8ec3aa4355359a9f72e.tar.gz gdb-a5ad232b3e6f39cf2955a8ec3aa4355359a9f72e.tar.bz2 |
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
Diffstat (limited to 'gdb/testsuite')
-rw-r--r-- | gdb/testsuite/ChangeLog | 7 | ||||
-rw-r--r-- | gdb/testsuite/gdb.fortran/ptr-indentation.exp | 41 | ||||
-rw-r--r-- | gdb/testsuite/gdb.fortran/ptr-indentation.f90 | 30 |
3 files changed, 78 insertions, 0 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 62d929c..198fe78 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2017-09-08 Frank Penczek <frank.penczek@intel.com> + Christoph Weinmann <christoph.t.weinmann@intel.com> + Bernhard Heckel <bernhard.heckel@intel.com> + + * gdb.fortran/ptr-indentation.f90: New file. + * gdb.fortran/ptr-indentation.exp: New file. + 2017-09-05 Tom Tromey <tom@tromey.com> 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 0000000..ea510f1 --- /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 <http://www.gnu.org/licenses/>. + +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 0000000..045f5ef --- /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 <http://www.gnu.org/licenses/>. + +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 |