diff options
Diffstat (limited to 'gcc/rust/hir/rust-ast-lower-pattern.cc')
| -rw-r--r-- | gcc/rust/hir/rust-ast-lower-pattern.cc | 54 |
1 files changed, 25 insertions, 29 deletions
diff --git a/gcc/rust/hir/rust-ast-lower-pattern.cc b/gcc/rust/hir/rust-ast-lower-pattern.cc index d534b82..96266dc 100644 --- a/gcc/rust/hir/rust-ast-lower-pattern.cc +++ b/gcc/rust/hir/rust-ast-lower-pattern.cc @@ -25,17 +25,17 @@ namespace HIR { ASTLoweringPattern::ASTLoweringPattern () : translated (nullptr) {} HIR::Pattern * -ASTLoweringPattern::translate (AST::Pattern *pattern, bool is_let_top_level) +ASTLoweringPattern::translate (AST::Pattern &pattern, bool is_let_top_level) { ASTLoweringPattern resolver; resolver.is_let_top_level = is_let_top_level; - pattern->accept_vis (resolver); + pattern.accept_vis (resolver); rust_assert (resolver.translated != nullptr); resolver.mappings->insert_hir_pattern (resolver.translated); resolver.mappings->insert_location ( - resolver.translated->get_mappings ().get_hirid (), pattern->get_locus ()); + resolver.translated->get_mappings ().get_hirid (), pattern.get_locus ()); return resolver.translated; } @@ -60,18 +60,18 @@ ASTLoweringPattern::visit (AST::IdentifierPattern &pattern) void ASTLoweringPattern::visit (AST::PathInExpression &pattern) { - translated = ASTLowerPathInExpression::translate (&pattern); + translated = ASTLowerPathInExpression::translate (pattern); } void ASTLoweringPattern::visit (AST::TupleStructPattern &pattern) { HIR::PathInExpression *path - = ASTLowerPathInExpression::translate (&pattern.get_path ()); + = ASTLowerPathInExpression::translate (pattern.get_path ()); TupleStructItems *lowered = nullptr; auto &items = pattern.get_items (); - switch (items->get_item_type ()) + switch (items.get_item_type ()) { case AST::TupleStructItems::RANGE: { // TODO @@ -81,13 +81,12 @@ ASTLoweringPattern::visit (AST::TupleStructPattern &pattern) case AST::TupleStructItems::NO_RANGE: { AST::TupleStructItemsNoRange &items_no_range - = static_cast<AST::TupleStructItemsNoRange &> (*items.get ()); + = static_cast<AST::TupleStructItemsNoRange &> (items); std::vector<std::unique_ptr<HIR::Pattern>> patterns; for (auto &inner_pattern : items_no_range.get_patterns ()) { - HIR::Pattern *p - = ASTLoweringPattern::translate (inner_pattern.get ()); + HIR::Pattern *p = ASTLoweringPattern::translate (*inner_pattern); patterns.push_back (std::unique_ptr<HIR::Pattern> (p)); } @@ -109,7 +108,7 @@ void ASTLoweringPattern::visit (AST::StructPattern &pattern) { HIR::PathInExpression *path - = ASTLowerPathInExpression::translate (&pattern.get_path ()); + = ASTLowerPathInExpression::translate (pattern.get_path ()); auto &raw_elems = pattern.get_struct_pattern_elems (); rust_assert (!raw_elems.has_etc ()); @@ -121,7 +120,7 @@ ASTLoweringPattern::visit (AST::StructPattern &pattern) switch (field->get_item_type ()) { case AST::StructPatternField::ItemType::TUPLE_PAT: { - AST::StructPatternFieldTuplePat &tuple + auto &tuple = static_cast<AST::StructPatternFieldTuplePat &> (*field); auto crate_num = mappings->get_current_crate (); @@ -130,8 +129,8 @@ ASTLoweringPattern::visit (AST::StructPattern &pattern) crate_num), UNKNOWN_LOCAL_DEFID); - std::unique_ptr<HIR::Pattern> pat (ASTLoweringPattern::translate ( - tuple.get_index_pattern ().get ())); + std::unique_ptr<HIR::Pattern> pat ( + ASTLoweringPattern::translate (tuple.get_index_pattern ())); f = new HIR::StructPatternFieldTuplePat (mapping, tuple.get_index (), @@ -151,8 +150,8 @@ ASTLoweringPattern::visit (AST::StructPattern &pattern) crate_num), UNKNOWN_LOCAL_DEFID); - std::unique_ptr<HIR::Pattern> pat (ASTLoweringPattern::translate ( - ident.get_ident_pattern ().get ())); + std::unique_ptr<HIR::Pattern> pat ( + ASTLoweringPattern::translate (ident.get_ident_pattern ())); f = new HIR::StructPatternFieldIdentPat (mapping, ident.get_identifier (), @@ -214,20 +213,19 @@ void ASTLoweringPattern::visit (AST::TuplePattern &pattern) { std::unique_ptr<HIR::TuplePatternItems> items; - switch (pattern.get_items ()->get_pattern_type ()) + switch (pattern.get_items ().get_pattern_type ()) { case AST::TuplePatternItems::TuplePatternItemType::MULTIPLE: { AST::TuplePatternItemsMultiple &ref - = *static_cast<AST::TuplePatternItemsMultiple *> ( - pattern.get_items ().get ()); + = static_cast<AST::TuplePatternItemsMultiple &> ( + pattern.get_items ()); items = lower_tuple_pattern_multiple (ref); } break; case AST::TuplePatternItems::TuplePatternItemType::RANGED: { AST::TuplePatternItemsRanged &ref - = *static_cast<AST::TuplePatternItemsRanged *> ( - pattern.get_items ().get ()); + = static_cast<AST::TuplePatternItemsRanged &> (pattern.get_items ()); items = lower_tuple_pattern_ranged (ref); } break; @@ -258,10 +256,8 @@ ASTLoweringPattern::visit (AST::LiteralPattern &pattern) void ASTLoweringPattern::visit (AST::RangePattern &pattern) { - auto upper_bound - = lower_range_pattern_bound (pattern.get_upper_bound ().get ()); - auto lower_bound - = lower_range_pattern_bound (pattern.get_lower_bound ().get ()); + auto upper_bound = lower_range_pattern_bound (pattern.get_upper_bound ()); + auto lower_bound = lower_range_pattern_bound (pattern.get_lower_bound ()); auto crate_num = mappings->get_current_crate (); Analysis::NodeMapping mapping (crate_num, pattern.get_node_id (), @@ -277,7 +273,7 @@ void ASTLoweringPattern::visit (AST::GroupedPattern &pattern) { is_let_top_level = false; - pattern.get_pattern_in_parens ()->accept_vis (*this); + pattern.get_pattern_in_parens ().accept_vis (*this); } void @@ -289,7 +285,7 @@ ASTLoweringPattern::visit (AST::ReferencePattern &pattern) UNKNOWN_LOCAL_DEFID); HIR::Pattern *inner - = ASTLoweringPattern::translate (pattern.get_referenced_pattern ().get ()); + = ASTLoweringPattern::translate (pattern.get_referenced_pattern ()); translated = new HIR::ReferencePattern (mapping, std::unique_ptr<HIR::Pattern> (inner), @@ -315,7 +311,7 @@ ASTLoweringPattern::visit (AST::SlicePattern &pattern) std::vector<std::unique_ptr<HIR::Pattern>> items; for (auto &p : pattern.get_items ()) { - HIR::Pattern *item = ASTLoweringPattern::translate (p.get ()); + HIR::Pattern *item = ASTLoweringPattern::translate (*p); items.push_back (std::unique_ptr<HIR::Pattern> (item)); } @@ -340,8 +336,8 @@ ASTLoweringPattern::visit (AST::AltPattern &pattern) for (auto &alt : pattern.get_alts ()) { - alts.push_back (std::unique_ptr<HIR::Pattern> ( - ASTLoweringPattern::translate (alt.get ()))); + alts.push_back ( + std::unique_ptr<HIR::Pattern> (ASTLoweringPattern::translate (*alt))); } translated |