diff options
| author | Jakub Dupak <dev@jakubdupak.com> | 2023-10-17 15:39:06 +0200 |
|---|---|---|
| committer | CohenArthur <arthur.cohen@embecosm.com> | 2023-10-23 11:37:37 +0000 |
| commit | ef4d1a8e16a7416a56e893bd3442a44ecf7ae70d (patch) | |
| tree | 3dd842177c274b6b5335083e3df65b4068f9522c | |
| parent | 8c7bc537efa1a9fa754aa36d05f8fafd9a16b1b1 (diff) | |
| download | gcc-ef4d1a8e16a7416a56e893bd3442a44ecf7ae70d.zip gcc-ef4d1a8e16a7416a56e893bd3442a44ecf7ae70d.tar.gz gcc-ef4d1a8e16a7416a56e893bd3442a44ecf7ae70d.tar.bz2 | |
ast: Handle tuplestruct pattern with indices
gcc/rust/ChangeLog:
* hir/rust-ast-lower-pattern.cc (ASTLoweringPattern::visit): Implement for tuple pat.
* resolve/rust-ast-resolve-pattern.cc (PatternDeclaration::visit): Implement for tupple pat.
gcc/testsuite/ChangeLog:
* rust/compile/tupple_struct_pattern_tuple.rs: New test.
Signed-off-by: Jakub Dupak <dev@jakubdupak.com>
| -rw-r--r-- | gcc/rust/hir/rust-ast-lower-pattern.cc | 19 | ||||
| -rw-r--r-- | gcc/rust/resolve/rust-ast-resolve-pattern.cc | 9 | ||||
| -rw-r--r-- | gcc/testsuite/rust/compile/tupple_struct_pattern_tuple.rs | 4 |
3 files changed, 25 insertions, 7 deletions
diff --git a/gcc/rust/hir/rust-ast-lower-pattern.cc b/gcc/rust/hir/rust-ast-lower-pattern.cc index bac79ef..f83c4d7 100644 --- a/gcc/rust/hir/rust-ast-lower-pattern.cc +++ b/gcc/rust/hir/rust-ast-lower-pattern.cc @@ -122,8 +122,23 @@ ASTLoweringPattern::visit (AST::StructPattern &pattern) switch (field->get_item_type ()) { case AST::StructPatternField::ItemType::TUPLE_PAT: { - // TODO - rust_unreachable (); + AST::StructPatternFieldTuplePat &tuple + = static_cast<AST::StructPatternFieldTuplePat &> (*field); + + auto crate_num = mappings->get_current_crate (); + Analysis::NodeMapping mapping (crate_num, tuple.get_node_id (), + mappings->get_next_hir_id ( + crate_num), + UNKNOWN_LOCAL_DEFID); + + std::unique_ptr<HIR::Pattern> pat (ASTLoweringPattern::translate ( + tuple.get_index_pattern ().get ())); + + f = new HIR::StructPatternFieldTuplePat (mapping, + tuple.get_index (), + std::move (pat), + tuple.get_outer_attrs (), + tuple.get_locus ()); } break; diff --git a/gcc/rust/resolve/rust-ast-resolve-pattern.cc b/gcc/rust/resolve/rust-ast-resolve-pattern.cc index fbdf6c4..bded367 100644 --- a/gcc/rust/resolve/rust-ast-resolve-pattern.cc +++ b/gcc/rust/resolve/rust-ast-resolve-pattern.cc @@ -124,8 +124,10 @@ PatternDeclaration::visit (AST::StructPattern &pattern) switch (field->get_item_type ()) { case AST::StructPatternField::ItemType::TUPLE_PAT: { - // TODO - rust_unreachable (); + AST::StructPatternFieldTuplePat &tuple + = static_cast<AST::StructPatternFieldTuplePat &> (*field); + + tuple.get_index_pattern ()->accept_vis (*this); } break; @@ -151,9 +153,6 @@ PatternDeclaration::visit (AST::StructPattern &pattern) break; } } - - // TODO - rust_assert (!struct_pattern_elems.has_etc ()); } void diff --git a/gcc/testsuite/rust/compile/tupple_struct_pattern_tuple.rs b/gcc/testsuite/rust/compile/tupple_struct_pattern_tuple.rs new file mode 100644 index 0000000..053b9ce --- /dev/null +++ b/gcc/testsuite/rust/compile/tupple_struct_pattern_tuple.rs @@ -0,0 +1,4 @@ +// { dg-additional-options "-frust-compile-until=typecheck" } +struct Struct(i32); + +fn struct_pattern(Struct { 0: a }: Struct) {} |