From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 41263 invoked by alias); 10 May 2016 14:16:27 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 41228 invoked by uid 89); 10 May 2016 14:16:25 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL,BAYES_00,KAM_LAZY_DOMAIN_SECURITY,RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=t2v X-HELO: mga02.intel.com Received: from mga02.intel.com (HELO mga02.intel.com) (134.134.136.20) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 10 May 2016 14:16:21 +0000 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP; 10 May 2016 07:16:20 -0700 X-ExtLoop1: 1 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga001.fm.intel.com with ESMTP; 10 May 2016 07:16:16 -0700 Received: from ulvlx001.iul.intel.com (ulvlx001.iul.intel.com [172.28.207.17]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id u4AEGEgv001795; Tue, 10 May 2016 15:16:14 +0100 Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id u4AEGE0M030656; Tue, 10 May 2016 16:16:14 +0200 Received: (from heckel@localhost) by ulvlx001.iul.intel.com with œ id u4AEGEsi030652; Tue, 10 May 2016 16:16:14 +0200 From: Bernhard Heckel To: qiyaoltc@gmail.com Cc: gdb-patches@sourceware.org, Bernhard Heckel Subject: [PATCH 3/4] Fortran, typeprint: Decrease level of details when printing elements of a structure. Date: Tue, 10 May 2016 14:16:00 -0000 Message-Id: <1462889739-30359-4-git-send-email-bernhard.heckel@intel.com> In-Reply-To: <1462889739-30359-1-git-send-email-bernhard.heckel@intel.com> References: <1462889739-30359-1-git-send-email-bernhard.heckel@intel.com> X-IsSubscribed: yes X-SW-Source: 2016-05/txt/msg00170.txt.bz2 According to the typeprint's description, the level of details is decreased by one for the typeprint of elements of a structure. Before: (gdb) ptype t3v type = Type t3 integer(kind=4) :: t3_i Type t2 integer(kind=4) :: t2_i Type t1 integer(kind=4) :: t1_i real(kind=4) :: t1_r End Type t1 :: t1_n End Type t2 :: t2_n End Type t3 After: (gdb) ptype t3v type = Type t3 integer(kind=4) :: t3_i Type t2 integer(kind=4) :: t2_i Type t1 :: t1_n End Type t2 :: t2_n End Type t3 2016-05-09 Bernhard Heckel gdb/Changelog: * f-typeprint.c (f_type_print_base): Decrease show by one. gdb/testsuite/Changelog: * gdb.fortran/type.f90: Add nested structures. * gdb.fortran/whatis_type.exp: Whatis/ptype nested structures. --- gdb/f-typeprint.c | 2 +- gdb/testsuite/gdb.fortran/type.f90 | 21 ++++++++++++++++++++- gdb/testsuite/gdb.fortran/whatis_type.exp | 22 ++++++++++++++++++++++ 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/gdb/f-typeprint.c b/gdb/f-typeprint.c index 49f374a..0389c14 100644 --- a/gdb/f-typeprint.c +++ b/gdb/f-typeprint.c @@ -376,7 +376,7 @@ f_type_print_base (struct type *type, struct ui_file *stream, int show, 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); + stream, show - 1, 0, 0, 0); fputs_filtered ("\n", stream); } fprintfi_filtered (level, stream, "End Type "); diff --git a/gdb/testsuite/gdb.fortran/type.f90 b/gdb/testsuite/gdb.fortran/type.f90 index b3ae693..00dc650 100644 --- a/gdb/testsuite/gdb.fortran/type.f90 +++ b/gdb/testsuite/gdb.fortran/type.f90 @@ -21,8 +21,27 @@ program type real :: t1_r end type t1 + type :: t2 + integer :: t2_i + type (t1) :: t1_n + end type t2 + + type :: t3 + integer :: t3_i + type (t2) :: t2_n + end type t3 + type (t1) :: t1v + type (t2) :: t2v + type (t3) :: t3v t1v%t1_i = 42 - t1v%t1_r = 42.24 ! bp1 + t1v%t1_r = 42.24 + + t2v%t2_i = 2 + t2v%t1_n%t1_i = 21 + t3v%t3_i = 3 + t3v%t2_n%t2_i = 32 + t3v%t2_n%t1_n%t1_i = 321 ! bp1 + end program type diff --git a/gdb/testsuite/gdb.fortran/whatis_type.exp b/gdb/testsuite/gdb.fortran/whatis_type.exp index 2caebe6..c1e2745 100644 --- a/gdb/testsuite/gdb.fortran/whatis_type.exp +++ b/gdb/testsuite/gdb.fortran/whatis_type.exp @@ -40,6 +40,10 @@ set t1_r "$real :: t1_r" gdb_test "whatis t1" "type = Type t1" gdb_test "whatis t1v" "type = Type t1" +gdb_test "whatis t2" "type = Type t2" +gdb_test "whatis t2v" "type = Type t2" +gdb_test "whatis t3" "type = Type t3" +gdb_test "whatis t3v" "type = Type t3" gdb_test "ptype t1" \ [multi_line "type = Type t1" \ @@ -52,3 +56,21 @@ gdb_test "ptype t1v" \ " $t1_i" \ " $t1_r" \ "End Type t1"] + +gdb_test "ptype t2v" \ + [multi_line "type = Type t2" \ + " $int :: t2_i" \ + " Type t1" \ + " $int :: t1_i" \ + " $real :: t1_r" \ + " End Type t1 :: t1_n" \ + "End Type t2"] + +gdb_test "ptype t3v" \ + [multi_line "type = Type t3" \ + " $int :: t3_i" \ + " Type t2" \ + " $int :: t2_i" \ + " Type t1 :: t1_n" \ + " End Type t2 :: t2_n" \ + "End Type t3"] -- 2.7.1.339.g0233b80