From patchwork Thu Sep 26 23:09:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 34685 Received: (qmail 50825 invoked by alias); 26 Sep 2019 23:09:46 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 50740 invoked by uid 89); 26 Sep 2019 23:09:46 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-23.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_STOCKGEN, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mail-wm1-f66.google.com Received: from mail-wm1-f66.google.com (HELO mail-wm1-f66.google.com) (209.85.128.66) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 26 Sep 2019 23:09:44 +0000 Received: by mail-wm1-f66.google.com with SMTP id v17so4201611wml.4 for ; Thu, 26 Sep 2019 16:09:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=0rl4U4+7vLsYyrMfy69JXcatnpym+7P6qBp6p0ebIwY=; b=Bfeg1wjdcykx4rSr01cBcaak1DQsC0xqtYC8y8LB87Qapq2yBkqu2u61pP6Vhzi5il HJcdr3uUI+fZtjF8IwMlMZgAQ6A2cdkBGRBYpbpDB53ek5bSvbwVmBtt02sN4dwlZ3pH Cgu9sB/BUW+DEGSTW5YeZoEGearjHMF5CkET0oumcu+fxLSG19dRyYWziooM3+RK4lxM vHELIae71tEN1iktbJimbjMmVUy11pId6ruKSRBmP4OQaW+jltgcuI1OlIlTnxsPg0UH GYVI0aL3olPVdQTLLRVLuApsfgGfSXkeN7FlODI/W5LcPDtKBUeNCdTk1jkYlc0WNNs1 vd4g== Return-Path: Received: from localhost (host86-128-12-122.range86-128.btcentralplus.com. [86.128.12.122]) by smtp.gmail.com with ESMTPSA id o19sm936612wro.50.2019.09.26.16.09.41 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Sep 2019 16:09:42 -0700 (PDT) From: Andrew Burgess To: gdb-patches Cc: Andrew Burgess Subject: [PATCH 1/3] gdb: Don't print a newline in language la_print_typedef methods Date: Fri, 27 Sep 2019 00:09:35 +0100 Message-Id: In-Reply-To: References: In-Reply-To: References: X-IsSubscribed: yes When calling the language la_print_typedef method, don't include a newline at the end, instead print the newline from the users of la_print_typedef. This change will be useful in a later commit when the output from la_print_typedef will be placed into an MI output field, in which case the trailing newline is not required. There should be no user visible changes after this commit. gdb/ChangeLog: * ada-typeprint.c (ada_print_typedef): Don't print newline at the end. * c-typeprint.c (c_print_typedef): Likewise. * f-typeprint.c (f_print_typedef): Likewise. * m2-typeprint.c (m2_print_typedef): Likewise. * p-typeprint.c (pascal_print_typedef): Likewise. * rust-lang.c (rust_print_typedef): Likewise. * symtab.c (print_symbol_info): Print a newline after calling typedef_print. --- gdb/ChangeLog | 12 ++++++++++++ gdb/ada-typeprint.c | 1 - gdb/c-typeprint.c | 2 +- gdb/f-typeprint.c | 1 - gdb/m2-typeprint.c | 2 +- gdb/p-typeprint.c | 2 +- gdb/rust-lang.c | 2 +- gdb/symtab.c | 6 ++---- 8 files changed, 18 insertions(+), 10 deletions(-) diff --git a/gdb/ada-typeprint.c b/gdb/ada-typeprint.c index 89a69e9bd44..f14a41fe835 100644 --- a/gdb/ada-typeprint.c +++ b/gdb/ada-typeprint.c @@ -951,5 +951,4 @@ ada_print_typedef (struct type *type, struct symbol *new_symbol, { type = ada_check_typedef (type); ada_print_type (type, "", stream, 0, 0, &type_print_raw_options); - fprintf_filtered (stream, "\n"); } diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c index 43ad3b3e0e6..c89acd4a7cd 100644 --- a/gdb/c-typeprint.c +++ b/gdb/c-typeprint.c @@ -211,7 +211,7 @@ c_print_typedef (struct type *type, SYMBOL_LINKAGE_NAME (new_symbol)) != 0 || TYPE_CODE (SYMBOL_TYPE (new_symbol)) == TYPE_CODE_TYPEDEF) fprintf_filtered (stream, " %s", SYMBOL_PRINT_NAME (new_symbol)); - fprintf_filtered (stream, ";\n"); + fprintf_filtered (stream, ";"); } /* If TYPE is a derived type, then print out derivation information. diff --git a/gdb/f-typeprint.c b/gdb/f-typeprint.c index 92b50938740..f7813d660ca 100644 --- a/gdb/f-typeprint.c +++ b/gdb/f-typeprint.c @@ -53,7 +53,6 @@ f_print_typedef (struct type *type, struct symbol *new_symbol, { type = check_typedef (type); f_print_type (type, "", stream, 0, 0, &type_print_raw_options); - fprintf_filtered (stream, "\n"); } /* LEVEL is the depth to indent lines by. */ diff --git a/gdb/m2-typeprint.c b/gdb/m2-typeprint.c index dae07d1c531..968d02a76a1 100644 --- a/gdb/m2-typeprint.c +++ b/gdb/m2-typeprint.c @@ -169,7 +169,7 @@ m2_print_typedef (struct type *type, struct symbol *new_symbol, else fprintf_filtered (stream, " = "); type_print (type, "", stream, 0); - fprintf_filtered (stream, ";\n"); + fprintf_filtered (stream, ";"); } /* m2_type_name - if a, type, has a name then print it. */ diff --git a/gdb/p-typeprint.c b/gdb/p-typeprint.c index d90b8ceb6ea..504ba477f91 100644 --- a/gdb/p-typeprint.c +++ b/gdb/p-typeprint.c @@ -100,7 +100,7 @@ pascal_print_typedef (struct type *type, struct symbol *new_symbol, fprintf_filtered (stream, "type "); fprintf_filtered (stream, "%s = ", SYMBOL_PRINT_NAME (new_symbol)); type_print (type, "", stream, 0); - fprintf_filtered (stream, ";\n"); + fprintf_filtered (stream, ";"); } /* If TYPE is a derived type, then print out derivation information. diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c index 79f13311cd8..518c667345a 100644 --- a/gdb/rust-lang.c +++ b/gdb/rust-lang.c @@ -828,7 +828,7 @@ rust_print_typedef (struct type *type, type = check_typedef (type); fprintf_filtered (stream, "type %s = ", SYMBOL_PRINT_NAME (new_symbol)); type_print (type, "", stream, 0); - fprintf_filtered (stream, ";\n"); + fprintf_filtered (stream, ";"); } /* la_print_type implementation for Rust. */ diff --git a/gdb/symtab.c b/gdb/symtab.c index 6ea9fc6971e..b4316479f53 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -4777,10 +4777,8 @@ print_symbol_info (enum search_domain kind, if (TYPE_CODE (SYMBOL_TYPE (sym)) == TYPE_CODE_TYPEDEF) typedef_print (SYMBOL_TYPE (sym), sym, gdb_stdout); else - { - type_print (SYMBOL_TYPE (sym), "", gdb_stdout, -1); - printf_filtered ("\n"); - } + type_print (SYMBOL_TYPE (sym), "", gdb_stdout, -1); + printf_filtered ("\n"); } /* variable, func, or typedef-that-is-c++-class. */ else if (kind < TYPES_DOMAIN