From 259d3bd58d8969923ad66c78ea4c8f1539aafbfd Mon Sep 17 00:00:00 2001 From: Jakub Dupak Date: Tue, 17 Oct 2023 15:39:06 +0200 Subject: gccrs: 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 --- gcc/rust/hir/rust-ast-lower-pattern.cc | 19 +++++++++++++++++-- gcc/rust/resolve/rust-ast-resolve-pattern.cc | 9 ++++----- 2 files changed, 21 insertions(+), 7 deletions(-) (limited to 'gcc/rust') diff --git a/gcc/rust/hir/rust-ast-lower-pattern.cc b/gcc/rust/hir/rust-ast-lower-pattern.cc index bfb7b71..4693e7d 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 (*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 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 9343005..545fcf8 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 (*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 -- cgit v1.1