public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Arthur Cohen <cohenarthur@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-8155] gccrs: Adjust item kind enums for TupleStructItems and TuplePatternItems Date: Tue, 16 Jan 2024 18:18:23 +0000 (GMT) [thread overview] Message-ID: <20240116181824.0087F3861801@sourceware.org> (raw) https://gcc.gnu.org/g:e621b174d7c622aa4b677a4c812e5061e311cc5c commit r14-8155-ge621b174d7c622aa4b677a4c812e5061e311cc5c Author: Owen Avery <powerboat9.gamer@gmail.com> Date: Fri Oct 6 09:15:17 2023 -0400 gccrs: Adjust item kind enums for TupleStructItems and TuplePatternItems gcc/rust/ChangeLog: * hir/tree/rust-hir-pattern.h (TupleStructItems::ItemType::RANGE): Rename to... (TupleStructItems::ItemType::RANGED): ...here. (TupleStructItems::ItemType::NO_RANGE): Rename to... (TupleStructItems::ItemType::MULTIPLE): ...here. (TuplePatternItems::TuplePatternItemType): Rename to... (TuplePatternItems::ItemType): ...here. : Handle renames. * backend/rust-compile-pattern.cc: Likewise. * typecheck/rust-hir-type-check-pattern.cc: Likewise. * checks/errors/borrowck/rust-bir-builder-pattern.h: Likewise. Signed-off-by: Owen Avery <powerboat9.gamer@gmail.com> Diff: --- gcc/rust/backend/rust-compile-pattern.cc | 12 ++++++------ .../errors/borrowck/rust-bir-builder-pattern.h | 4 ++-- gcc/rust/hir/tree/rust-hir-pattern.h | 22 ++++++++-------------- gcc/rust/typecheck/rust-hir-type-check-pattern.cc | 8 ++++---- 4 files changed, 20 insertions(+), 26 deletions(-) diff --git a/gcc/rust/backend/rust-compile-pattern.cc b/gcc/rust/backend/rust-compile-pattern.cc index 9e134808564..4fa611f5383 100644 --- a/gcc/rust/backend/rust-compile-pattern.cc +++ b/gcc/rust/backend/rust-compile-pattern.cc @@ -355,13 +355,13 @@ CompilePatternCheckExpr::visit (HIR::TupleStructPattern &pattern) std::unique_ptr<HIR::TupleStructItems> &items = pattern.get_items (); switch (items->get_item_type ()) { - case HIR::TupleStructItems::RANGE: { + case HIR::TupleStructItems::RANGED: { // TODO rust_unreachable (); } break; - case HIR::TupleStructItems::NO_RANGE: { + case HIR::TupleStructItems::MULTIPLE: { HIR::TupleStructItemsNoRange &items_no_range = static_cast<HIR::TupleStructItemsNoRange &> (*items.get ()); @@ -457,13 +457,13 @@ CompilePatternBindings::visit (HIR::TupleStructPattern &pattern) std::unique_ptr<HIR::TupleStructItems> &items = pattern.get_items (); switch (items->get_item_type ()) { - case HIR::TupleStructItems::RANGE: { + case HIR::TupleStructItems::RANGED: { // TODO rust_unreachable (); } break; - case HIR::TupleStructItems::NO_RANGE: { + case HIR::TupleStructItems::MULTIPLE: { HIR::TupleStructItemsNoRange &items_no_range = static_cast<HIR::TupleStructItemsNoRange &> (*items.get ()); @@ -667,7 +667,7 @@ CompilePatternLet::visit (HIR::TuplePattern &pattern) switch (pattern.get_items ()->get_item_type ()) { - case HIR::TuplePatternItems::TuplePatternItemType::RANGED: { + case HIR::TuplePatternItems::ItemType::RANGED: { size_t tuple_idx = 0; auto &items = static_cast<HIR::TuplePatternItemsRanged &> (*pattern.get_items ()); @@ -711,7 +711,7 @@ CompilePatternLet::visit (HIR::TuplePattern &pattern) return; } - case HIR::TuplePatternItems::TuplePatternItemType::MULTIPLE: { + case HIR::TuplePatternItems::ItemType::MULTIPLE: { size_t tuple_idx = 0; auto &items = static_cast<HIR::TuplePatternItemsMultiple &> ( *pattern.get_items ()); diff --git a/gcc/rust/checks/errors/borrowck/rust-bir-builder-pattern.h b/gcc/rust/checks/errors/borrowck/rust-bir-builder-pattern.h index 0596264afc5..9949ef17989 100644 --- a/gcc/rust/checks/errors/borrowck/rust-bir-builder-pattern.h +++ b/gcc/rust/checks/errors/borrowck/rust-bir-builder-pattern.h @@ -260,7 +260,7 @@ public: size_t index = 0; switch (pattern.get_items ()->get_item_type ()) { - case HIR::TupleStructItems::RANGE: { + case HIR::TupleStructItems::RANGED: { auto &items = static_cast<HIR::TupleStructItemsRange &> (*pattern.get_items ()); @@ -278,7 +278,7 @@ public: visit_tuple_fields (items.get_upper_patterns (), saved, index); break; } - case HIR::TupleStructItems::NO_RANGE: { + case HIR::TupleStructItems::MULTIPLE: { auto &items = static_cast<HIR::TupleStructItemsNoRange &> ( *pattern.get_items ()); visit_tuple_fields (items.get_patterns (), saved, index); diff --git a/gcc/rust/hir/tree/rust-hir-pattern.h b/gcc/rust/hir/tree/rust-hir-pattern.h index a76a0a40d5f..33025bfdb6b 100644 --- a/gcc/rust/hir/tree/rust-hir-pattern.h +++ b/gcc/rust/hir/tree/rust-hir-pattern.h @@ -783,8 +783,8 @@ class TupleStructItems : public FullVisitable public: enum ItemType { - RANGE, - NO_RANGE + MULTIPLE, + RANGED, }; virtual ~TupleStructItems () {} @@ -852,7 +852,7 @@ public: return patterns; } - ItemType get_item_type () const override final { return ItemType::NO_RANGE; } + ItemType get_item_type () const override final { return ItemType::MULTIPLE; } protected: /* Use covariance to implement clone function as returning this object rather @@ -931,7 +931,7 @@ public: return upper_patterns; } - ItemType get_item_type () const override final { return ItemType::RANGE; } + ItemType get_item_type () const override final { return ItemType::RANGED; } protected: /* Use covariance to implement clone function as returning this object rather @@ -1014,7 +1014,7 @@ protected: class TuplePatternItems : public FullVisitable { public: - enum TuplePatternItemType + enum ItemType { MULTIPLE, RANGED, @@ -1032,7 +1032,7 @@ public: virtual std::string as_string () const = 0; - virtual TuplePatternItemType get_item_type () const = 0; + virtual ItemType get_item_type () const = 0; protected: // pure virtual clone implementation @@ -1077,10 +1077,7 @@ public: void accept_vis (HIRFullVisitor &vis) override; - TuplePatternItemType get_item_type () const override - { - return TuplePatternItemType::MULTIPLE; - } + ItemType get_item_type () const override { return ItemType::MULTIPLE; } std::vector<std::unique_ptr<Pattern>> &get_patterns () { return patterns; } const std::vector<std::unique_ptr<Pattern>> &get_patterns () const @@ -1147,10 +1144,7 @@ public: void accept_vis (HIRFullVisitor &vis) override; - TuplePatternItemType get_item_type () const override - { - return TuplePatternItemType::RANGED; - } + ItemType get_item_type () const override { return ItemType::RANGED; } std::vector<std::unique_ptr<Pattern>> &get_lower_patterns () { diff --git a/gcc/rust/typecheck/rust-hir-type-check-pattern.cc b/gcc/rust/typecheck/rust-hir-type-check-pattern.cc index 9d55f53425f..19f742f2154 100644 --- a/gcc/rust/typecheck/rust-hir-type-check-pattern.cc +++ b/gcc/rust/typecheck/rust-hir-type-check-pattern.cc @@ -101,13 +101,13 @@ TypeCheckPattern::visit (HIR::TupleStructPattern &pattern) std::unique_ptr<HIR::TupleStructItems> &items = pattern.get_items (); switch (items->get_item_type ()) { - case HIR::TupleStructItems::RANGE: { + case HIR::TupleStructItems::RANGED: { // TODO rust_unreachable (); } break; - case HIR::TupleStructItems::NO_RANGE: { + case HIR::TupleStructItems::MULTIPLE: { HIR::TupleStructItemsNoRange &items_no_range = static_cast<HIR::TupleStructItemsNoRange &> (*items.get ()); @@ -297,7 +297,7 @@ TypeCheckPattern::visit (HIR::TuplePattern &pattern) std::unique_ptr<HIR::TuplePatternItems> items; switch (pattern.get_items ()->get_item_type ()) { - case HIR::TuplePatternItems::TuplePatternItemType::MULTIPLE: { + case HIR::TuplePatternItems::ItemType::MULTIPLE: { HIR::TuplePatternItemsMultiple &ref = *static_cast<HIR::TuplePatternItemsMultiple *> ( pattern.get_items ().get ()); @@ -336,7 +336,7 @@ TypeCheckPattern::visit (HIR::TuplePattern &pattern) } break; - case HIR::TuplePatternItems::TuplePatternItemType::RANGED: { + case HIR::TuplePatternItems::ItemType::RANGED: { // HIR::TuplePatternItemsRanged &ref // = *static_cast<HIR::TuplePatternItemsRanged *> ( // pattern.get_items ().get ());
reply other threads:[~2024-01-16 18:18 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20240116181824.0087F3861801@sourceware.org \ --to=cohenarthur@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).