diff options
| author | Owen Avery <powerboat9.gamer@gmail.com> | 2023-10-03 17:56:33 -0400 |
|---|---|---|
| committer | CohenArthur <arthur.cohen@embecosm.com> | 2023-10-16 13:27:55 +0000 |
| commit | 464cfa56f36f043c4b5703489f4cee651f4db625 (patch) | |
| tree | a40672bca069b5138bf4bdfcf33d61fd90576212 | |
| parent | 7292e71b61d95c0cec8378555e71a11a6e4120c0 (diff) | |
| download | gcc-464cfa56f36f043c4b5703489f4cee651f4db625.zip gcc-464cfa56f36f043c4b5703489f4cee651f4db625.tar.gz gcc-464cfa56f36f043c4b5703489f4cee651f4db625.tar.bz2 | |
Adjust methods for TuplePatternItems to match TupleStructItems
gcc/rust/ChangeLog:
* hir/tree/rust-hir-pattern.h
(TuplePatternItems::get_pattern_type): Rename to...
(TuplePatternItems::get_item_type): ...here.
(TuplePatternItemsMultiple::get_pattern_type): Rename to...
(TuplePatternItemsMultiple::get_item_type): ...here.
(TuplePatternItemsRanged::get_pattern_type): Rename to...
(TuplePatternItemsRanged::get_item_type): ...here.
* backend/rust-compile-expr.cc: Adjust calls to renamed methods.
* backend/rust-compile-pattern.cc: Likewise.
* typecheck/rust-hir-type-check-pattern.cc: Likewise.
Signed-off-by: Owen Avery <powerboat9.gamer@gmail.com>
| -rw-r--r-- | gcc/rust/backend/rust-compile-expr.cc | 2 | ||||
| -rw-r--r-- | gcc/rust/backend/rust-compile-pattern.cc | 2 | ||||
| -rw-r--r-- | gcc/rust/hir/tree/rust-hir-pattern.h | 6 | ||||
| -rw-r--r-- | gcc/rust/typecheck/rust-hir-type-check-pattern.cc | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/gcc/rust/backend/rust-compile-expr.cc b/gcc/rust/backend/rust-compile-expr.cc index 1f0b58e..9796995 100644 --- a/gcc/rust/backend/rust-compile-expr.cc +++ b/gcc/rust/backend/rust-compile-expr.cc @@ -1038,7 +1038,7 @@ sort_tuple_patterns (HIR::MatchExpr &expr) auto items = HIR::TuplePattern (ref).get_items ()->clone_tuple_pattern_items (); - if (items->get_pattern_type () + if (items->get_item_type () == HIR::TuplePatternItems::TuplePatternItemType::MULTIPLE) { auto items_ref diff --git a/gcc/rust/backend/rust-compile-pattern.cc b/gcc/rust/backend/rust-compile-pattern.cc index 05bd94d..39ba74e 100644 --- a/gcc/rust/backend/rust-compile-pattern.cc +++ b/gcc/rust/backend/rust-compile-pattern.cc @@ -416,7 +416,7 @@ CompilePatternLet::visit (HIR::TuplePattern &pattern) tree access_expr = Backend::var_expression (tmp_var, pattern.get_locus ()); ctx->add_statement (init_stmt); - switch (pattern.get_items ()->get_pattern_type ()) + switch (pattern.get_items ()->get_item_type ()) { case HIR::TuplePatternItems::TuplePatternItemType::RANGED: { size_t tuple_idx = 0; diff --git a/gcc/rust/hir/tree/rust-hir-pattern.h b/gcc/rust/hir/tree/rust-hir-pattern.h index b3dc56a..1f98d42 100644 --- a/gcc/rust/hir/tree/rust-hir-pattern.h +++ b/gcc/rust/hir/tree/rust-hir-pattern.h @@ -1033,7 +1033,7 @@ public: virtual std::string as_string () const = 0; - virtual TuplePatternItemType get_pattern_type () const = 0; + virtual TuplePatternItemType get_item_type () const = 0; protected: // pure virtual clone implementation @@ -1078,7 +1078,7 @@ public: void accept_vis (HIRFullVisitor &vis) override; - TuplePatternItemType get_pattern_type () const override + TuplePatternItemType get_item_type () const override { return TuplePatternItemType::MULTIPLE; } @@ -1148,7 +1148,7 @@ public: void accept_vis (HIRFullVisitor &vis) override; - TuplePatternItemType get_pattern_type () const override + TuplePatternItemType get_item_type () const override { return TuplePatternItemType::RANGED; } diff --git a/gcc/rust/typecheck/rust-hir-type-check-pattern.cc b/gcc/rust/typecheck/rust-hir-type-check-pattern.cc index 0786f89..397d57f 100644 --- a/gcc/rust/typecheck/rust-hir-type-check-pattern.cc +++ b/gcc/rust/typecheck/rust-hir-type-check-pattern.cc @@ -296,7 +296,7 @@ void TypeCheckPattern::visit (HIR::TuplePattern &pattern) { std::unique_ptr<HIR::TuplePatternItems> items; - switch (pattern.get_items ()->get_pattern_type ()) + switch (pattern.get_items ()->get_item_type ()) { case HIR::TuplePatternItems::TuplePatternItemType::MULTIPLE: { HIR::TuplePatternItemsMultiple &ref |