From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 4A680385840B; Tue, 8 Nov 2022 09:29:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4A680385840B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1667899745; bh=68oS4Fvk2T1XD/w3rlHwJPhem+S8MEO5Owiyw8m22TE=; h=From:To:Subject:Date:From; b=VEKWZTKW6XMh+6Aj155n8TaqhZPtQp/2aThS6uo+m95VH+bPgGwQggmg/5o2gvF2s Qt+N65N1ypJD2gkEp5GW2+l9Qi9yowN+l1b5zySAECTGNFDkH6pCwZiAJE48Bbiie4 5FNXXTNs7jgL3t8y5VcWnKQb2SOeeXSHLbNhu6T4= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] ast: Dump add proper `line_trailing` argument to `visit_items_as_block` X-Act-Checkin: gcc X-Git-Author: Jakub Dupak X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: 7486d6cda4205fd6df47caf5e9a9451f7d9f7705 X-Git-Newrev: dd6296cffed6943de1cde7baead9177404323c4d Message-Id: <20221108092905.4A680385840B@sourceware.org> Date: Tue, 8 Nov 2022 09:29:05 +0000 (GMT) List-Id: https://gcc.gnu.org/g:dd6296cffed6943de1cde7baead9177404323c4d commit dd6296cffed6943de1cde7baead9177404323c4d Author: Jakub Dupak Date: Fri Oct 28 17:49:29 2022 +0200 ast: Dump add proper `line_trailing` argument to `visit_items_as_block` Signed-off-by: Jakub Dupak Diff: --- gcc/rust/ast/rust-ast-dump.cc | 21 +++++++++++---------- gcc/rust/ast/rust-ast-dump.h | 4 ++-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/gcc/rust/ast/rust-ast-dump.cc b/gcc/rust/ast/rust-ast-dump.cc index 986a8b3ed13..191e328b134 100644 --- a/gcc/rust/ast/rust-ast-dump.cc +++ b/gcc/rust/ast/rust-ast-dump.cc @@ -101,7 +101,8 @@ Dump::visit_items_as_lines (T &collection, const std::string &trailing) template void -Dump::visit_items_as_block (T &collection, char left_brace, char right_brace) +Dump::visit_items_as_block (T &collection, const std::string &line_trailing, + char left_brace, char right_brace) { if (collection.empty ()) { @@ -112,7 +113,7 @@ Dump::visit_items_as_block (T &collection, char left_brace, char right_brace) stream << left_brace << '\n'; indentation.increment (); - visit_items_as_lines (collection, ","); + visit_items_as_lines (collection, line_trailing); indentation.decrement (); stream << indentation << right_brace << '\n'; @@ -944,7 +945,7 @@ Dump::visit (StructStruct &struct_item) // FIXME: where-clause - visit_items_as_block (struct_item.get_fields ()); + visit_items_as_block (struct_item.get_fields (), ","); } void @@ -979,7 +980,7 @@ void Dump::visit (EnumItemStruct &item) { stream << item.get_identifier (); - visit_items_as_block (item.get_struct_fields ()); + visit_items_as_block (item.get_struct_fields (), ","); } void @@ -998,7 +999,7 @@ Dump::visit (Enum &enum_item) // FIXME: where-clause - visit_items_as_block (enum_item.get_variants ()); + visit_items_as_block (enum_item.get_variants (), ","); } void @@ -1010,7 +1011,7 @@ Dump::visit (Union &union_item) // FIXME: where-clause - visit_items_as_block (union_item.get_variants ()); + visit_items_as_block (union_item.get_variants (), ","); } void @@ -1114,7 +1115,7 @@ Dump::visit (Trait &trait) stream << ">"; } - visit_items_as_block (trait.get_trait_items ()); + visit_items_as_block (trait.get_trait_items (), ""); } void @@ -1129,7 +1130,7 @@ Dump::visit (InherentImpl &impl) // FIXME: Handle where-clause // FIXME: Handle inner attributes - visit_items_as_block (impl.get_impl_items ()); + visit_items_as_block (impl.get_impl_items (), ""); } void @@ -1182,7 +1183,7 @@ Dump::visit (ExternBlock &block) if (block.has_abi ()) stream << "\"" << block.get_abi () << "\" "; - visit_items_as_block (block.get_extern_items ()); + visit_items_as_block (block.get_extern_items (), ";"); } static std::pair @@ -1277,7 +1278,7 @@ Dump::visit (MacroRulesDefinition &rules_def) stream << "macro_rules! " << rules_def.get_rule_name (); - visit_items_as_block (rules_def.get_rules ()); + visit_items_as_block (rules_def.get_rules (), ";"); } void diff --git a/gcc/rust/ast/rust-ast-dump.h b/gcc/rust/ast/rust-ast-dump.h index f63c214f41a..13c92123ea9 100644 --- a/gcc/rust/ast/rust-ast-dump.h +++ b/gcc/rust/ast/rust-ast-dump.h @@ -112,8 +112,8 @@ private: * collection to print only the delimiters with no new line inside. */ template - void visit_items_as_block (T &collection, char left_brace = '{', - char right_brace = '}'); + void visit_items_as_block (T &collection, const std::string &line_trailing, + char left_brace = '{', char right_brace = '}'); /** * Visit common items of functions: Parameters, return type, block