From patchwork Fri Feb 3 04:28:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 19104 Received: (qmail 62090 invoked by alias); 3 Feb 2017 04:28:55 -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 61708 invoked by uid 89); 3 Feb 2017 04:28:50 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.3 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=no version=3.3.2 spammy=unions, Unions, *flags, *type X-HELO: gproxy10-pub.mail.unifiedlayer.com Received: from gproxy10-pub.mail.unifiedlayer.com (HELO gproxy10-pub.mail.unifiedlayer.com) (69.89.20.226) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with SMTP; Fri, 03 Feb 2017 04:28:41 +0000 Received: (qmail 24215 invoked by uid 0); 3 Feb 2017 04:28:39 -0000 Received: from unknown (HELO cmgw2) (10.0.90.83) by gproxy10.mail.unifiedlayer.com with SMTP; 3 Feb 2017 04:28:39 -0000 Received: from box522.bluehost.com ([74.220.219.122]) by cmgw2 with id g4Uc1u00F2f2jeq014UfeW; Thu, 02 Feb 2017 21:28:39 -0700 X-Authority-Analysis: v=2.1 cv=H5NInYoi c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=n2v9WMKugxEA:10 a=zstS-IiYAAAA:8 a=-9GYiZgLs8SfGSvv-AgA:9 a=uJwhyWIMt7EXdlr1:21 a=aOsorGaMJm3yhpyg:21 a=4G6NA9xxw8l3yy4pmD5M:22 Received: from 174-16-146-181.hlrn.qwest.net ([174.16.146.181]:54284 helo=bapiya.Home) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.87) (envelope-from ) id 1cZVUC-0002Mm-9m; Thu, 02 Feb 2017 21:28:36 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [FYI 2/3] Reindent rust-lang.c Date: Thu, 2 Feb 2017 21:28:29 -0700 Message-Id: <20170203042830.31311-3-tom@tromey.com> In-Reply-To: <20170203042830.31311-1-tom@tromey.com> References: <20170203042830.31311-1-tom@tromey.com> X-BWhitelist: no X-Exim-ID: 1cZVUC-0002Mm-9m X-Source-Sender: 174-16-146-181.hlrn.qwest.net (bapiya.Home) [174.16.146.181]:54284 X-Source-Auth: tom+tromey.com X-Email-Count: 3 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== I noticed a few spots in rust-lang.c had incorrect indentation. This patch fixes this. 2017-02-02 Tom Tromey * rust-lang.c: Reindent. --- gdb/ChangeLog | 4 ++ gdb/rust-lang.c | 146 ++++++++++++++++++++++++++++---------------------------- 2 files changed, 77 insertions(+), 73 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index cb47f73..d133a2e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 2017-02-02 Tom Tromey + * rust-lang.c: Reindent. + +2017-02-02 Tom Tromey + * rust-lang.h (rust_crate_for_block): Update. * rust-lang.c (rust_crate_for_block): Return std::string. (rust_get_disr_info): Use std:;string, not diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c index 17df6bb..a483b96 100644 --- a/gdb/rust-lang.c +++ b/gdb/rust-lang.c @@ -100,7 +100,7 @@ rust_union_is_untagged (struct type *type) if (TYPE_NFIELDS (type) == 0) return false; /* If the first field is named, but the name has the rust enum prefix, - it is an enum. */ + it is an enum. */ if (strncmp (TYPE_FIELD_NAME (type, 0), RUST_ENUM_PREFIX, strlen (RUST_ENUM_PREFIX)) == 0) return false; @@ -514,8 +514,8 @@ val_print_struct (struct type *type, int embedded_offset, if (options->prettyformat) { - fputs_filtered ("\n", stream); - print_spaces_filtered (2 + 2 * recurse, stream); + fputs_filtered ("\n", stream); + print_spaces_filtered (2 + 2 * recurse, stream); } else if (!first_field) fputs_filtered (" ", stream); @@ -524,15 +524,15 @@ val_print_struct (struct type *type, int embedded_offset, if (!is_tuple && !is_tuple_struct) { - fputs_filtered (TYPE_FIELD_NAME (type, i), stream); - fputs_filtered (": ", stream); + fputs_filtered (TYPE_FIELD_NAME (type, i), stream); + fputs_filtered (": ", stream); } val_print (TYPE_FIELD_TYPE (type, i), - embedded_offset + TYPE_FIELD_BITPOS (type, i) / 8, - address, - stream, recurse + 1, val, &opts, - current_language); + embedded_offset + TYPE_FIELD_BITPOS (type, i) / 8, + address, + stream, recurse + 1, val, &opts, + current_language); } if (options->prettyformat) @@ -659,17 +659,17 @@ rust_val_print (struct type *type, int embedded_offset, struct disr_info disr; struct value_print_options opts; - /* Untagged unions are printed as if they are structs. - Since the field bit positions overlap in the debuginfo, - the code for printing a union is same as that for a struct, - the only difference is that the input type will have overlapping - fields. */ - if (rust_union_is_untagged (type)) - { - val_print_struct (type, embedded_offset, address, stream, - recurse, val, options); - break; - } + /* Untagged unions are printed as if they are structs. + Since the field bit positions overlap in the debuginfo, + the code for printing a union is same as that for a struct, + the only difference is that the input type will have overlapping + fields. */ + if (rust_union_is_untagged (type)) + { + val_print_struct (type, embedded_offset, address, stream, + recurse, val, options); + break; + } opts = *options; opts.deref_ref = 0; @@ -760,62 +760,62 @@ rust_print_type (struct type *type, const char *varstring, /* Print a struct or union typedef. */ static void rust_print_struct_def (struct type *type, const char *varstring, - struct ui_file *stream, int show, int level, - const struct type_print_options *flags) + struct ui_file *stream, int show, int level, + const struct type_print_options *flags) { - int is_tuple_struct, i; + int is_tuple_struct, i; - /* Print a tuple type simply. */ - if (rust_tuple_type_p (type)) - { - fputs_filtered (TYPE_TAG_NAME (type), stream); - return; - } + /* Print a tuple type simply. */ + if (rust_tuple_type_p (type)) + { + fputs_filtered (TYPE_TAG_NAME (type), stream); + return; + } - /* If we see a base class, delegate to C. */ - if (TYPE_N_BASECLASSES (type) > 0) - c_print_type (type, varstring, stream, show, level, flags); + /* If we see a base class, delegate to C. */ + if (TYPE_N_BASECLASSES (type) > 0) + c_print_type (type, varstring, stream, show, level, flags); /* This code path is also used by unions. */ if (TYPE_CODE (type) == TYPE_CODE_STRUCT) - fputs_filtered ("struct ", stream); + fputs_filtered ("struct ", stream); else - fputs_filtered ("union ", stream); + fputs_filtered ("union ", stream); - if (TYPE_TAG_NAME (type) != NULL) - fputs_filtered (TYPE_TAG_NAME (type), stream); + if (TYPE_TAG_NAME (type) != NULL) + fputs_filtered (TYPE_TAG_NAME (type), stream); - is_tuple_struct = rust_tuple_struct_type_p (type); + is_tuple_struct = rust_tuple_struct_type_p (type); - if (TYPE_NFIELDS (type) == 0 && !rust_tuple_type_p (type)) - return; - fputs_filtered (is_tuple_struct ? " (\n" : " {\n", stream); + if (TYPE_NFIELDS (type) == 0 && !rust_tuple_type_p (type)) + return; + fputs_filtered (is_tuple_struct ? " (\n" : " {\n", stream); - for (i = 0; i < TYPE_NFIELDS (type); ++i) - { - const char *name; + for (i = 0; i < TYPE_NFIELDS (type); ++i) + { + const char *name; - QUIT; - if (field_is_static (&TYPE_FIELD (type, i))) - continue; - - /* We'd like to print "pub" here as needed, but rustc - doesn't emit the debuginfo, and our types don't have - cplus_struct_type attached. */ - - /* For a tuple struct we print the type but nothing - else. */ - print_spaces_filtered (level + 2, stream); - if (!is_tuple_struct) - fprintf_filtered (stream, "%s: ", TYPE_FIELD_NAME (type, i)); - - rust_print_type (TYPE_FIELD_TYPE (type, i), NULL, - stream, show - 1, level + 2, - flags); - fputs_filtered (",\n", stream); - } + QUIT; + if (field_is_static (&TYPE_FIELD (type, i))) + continue; + + /* We'd like to print "pub" here as needed, but rustc + doesn't emit the debuginfo, and our types don't have + cplus_struct_type attached. */ + + /* For a tuple struct we print the type but nothing + else. */ + print_spaces_filtered (level + 2, stream); + if (!is_tuple_struct) + fprintf_filtered (stream, "%s: ", TYPE_FIELD_NAME (type, i)); + + rust_print_type (TYPE_FIELD_TYPE (type, i), NULL, + stream, show - 1, level + 2, + flags); + fputs_filtered (",\n", stream); + } - fprintfi_filtered (level, stream, is_tuple_struct ? ")" : "}"); + fprintfi_filtered (level, stream, is_tuple_struct ? ")" : "}"); } /* la_print_typedef implementation for Rust. */ @@ -906,7 +906,7 @@ rust_print_type (struct type *type, const char *varstring, break; case TYPE_CODE_STRUCT: - rust_print_struct_def (type, varstring, stream, show, level, flags); + rust_print_struct_def (type, varstring, stream, show, level, flags); break; case TYPE_CODE_ENUM: @@ -947,15 +947,15 @@ rust_print_type (struct type *type, const char *varstring, /* Skip the discriminant field. */ int skip_to = 1; - /* Unions and structs have the same syntax in Rust, - the only difference is that structs are declared with `struct` - and union with `union`. This difference is handled in the struct - printer. */ - if (rust_union_is_untagged (type)) - { - rust_print_struct_def (type, varstring, stream, show, level, flags); - break; - } + /* Unions and structs have the same syntax in Rust, + the only difference is that structs are declared with `struct` + and union with `union`. This difference is handled in the struct + printer. */ + if (rust_union_is_untagged (type)) + { + rust_print_struct_def (type, varstring, stream, show, level, flags); + break; + } fputs_filtered ("enum ", stream); if (TYPE_TAG_NAME (type) != NULL)