From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id B243E385829B; Sat, 22 Oct 2022 10:47:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B243E385829B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666435666; bh=z20VZKwpS+Bq+aaOAF3h1c2wmi49K0JTVxqLLD80jIw=; h=From:To:Subject:Date:From; b=rd54gSclEgLQWQmqG+FcQbVNuF9W5FvDbTpwcCyIk56vFb6DGU/JLaTm8zZUo8tiZ cWH+tGlCLH1HaFNY+/oSH+QcXr9F5PNE3LNwNCsGujA/S5qKWx+PQnQwKHDeGATRHN b77fjB5fV7Rakbjm5GzaY1zYzfy2j9oqnsJqlOiU= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] Formatting cleanup in HIR lowering pattern X-Act-Checkin: gcc X-Git-Author: Philip Herron X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: 5f25f457eca1e04e577aae8e60fe640bb32d36fc X-Git-Newrev: 8e2d13922fb4af8d00bdabd7af964e4f11b84259 Message-Id: <20221022104746.B243E385829B@sourceware.org> Date: Sat, 22 Oct 2022 10:47:46 +0000 (GMT) List-Id: https://gcc.gnu.org/g:8e2d13922fb4af8d00bdabd7af964e4f11b84259 commit 8e2d13922fb4af8d00bdabd7af964e4f11b84259 Author: Philip Herron Date: Mon Oct 17 17:27:01 2022 +0100 Formatting cleanup in HIR lowering pattern Move implementation into cc file from the header and remove unnessecary new lines in the expr lowering header. Diff: --- gcc/rust/hir/rust-ast-lower-pattern.cc | 18 +++++++++++++ gcc/rust/hir/rust-ast-lower-pattern.h | 24 ++---------------- gcc/rust/resolve/rust-ast-resolve-expr.h | 43 -------------------------------- 3 files changed, 20 insertions(+), 65 deletions(-) diff --git a/gcc/rust/hir/rust-ast-lower-pattern.cc b/gcc/rust/hir/rust-ast-lower-pattern.cc index 2421ca84651..2c9a0dc59a1 100644 --- a/gcc/rust/hir/rust-ast-lower-pattern.cc +++ b/gcc/rust/hir/rust-ast-lower-pattern.cc @@ -22,6 +22,24 @@ namespace Rust { namespace HIR { +ASTLoweringPattern::ASTLoweringPattern () : translated (nullptr) {} + +HIR::Pattern * +ASTLoweringPattern::translate (AST::Pattern *pattern) +{ + ASTLoweringPattern resolver; + pattern->accept_vis (resolver); + + rust_assert (resolver.translated != nullptr); + + resolver.mappings->insert_hir_pattern (resolver.translated); + resolver.mappings->insert_location ( + resolver.translated->get_pattern_mappings ().get_hirid (), + pattern->get_locus ()); + + return resolver.translated; +} + void ASTLoweringPattern::visit (AST::IdentifierPattern &pattern) { diff --git a/gcc/rust/hir/rust-ast-lower-pattern.h b/gcc/rust/hir/rust-ast-lower-pattern.h index aab99f602d5..4ab81a856a7 100644 --- a/gcc/rust/hir/rust-ast-lower-pattern.h +++ b/gcc/rust/hir/rust-ast-lower-pattern.h @@ -29,39 +29,19 @@ class ASTLoweringPattern : public ASTLoweringBase using Rust::HIR::ASTLoweringBase::visit; public: - static HIR::Pattern *translate (AST::Pattern *pattern) - { - ASTLoweringPattern resolver; - pattern->accept_vis (resolver); - - rust_assert (resolver.translated != nullptr); - - resolver.mappings->insert_hir_pattern (resolver.translated); - resolver.mappings->insert_location ( - resolver.translated->get_pattern_mappings ().get_hirid (), - pattern->get_locus ()); - - return resolver.translated; - } + static HIR::Pattern *translate (AST::Pattern *pattern); void visit (AST::IdentifierPattern &pattern) override; - void visit (AST::PathInExpression &pattern) override; - void visit (AST::StructPattern &pattern) override; - void visit (AST::TupleStructPattern &pattern) override; - void visit (AST::WildcardPattern &pattern) override; - void visit (AST::TuplePattern &pattern) override; - void visit (AST::LiteralPattern &pattern) override; - void visit (AST::RangePattern &pattern) override; private: - ASTLoweringPattern () : translated (nullptr) {} + ASTLoweringPattern (); HIR::Pattern *translated; }; diff --git a/gcc/rust/resolve/rust-ast-resolve-expr.h b/gcc/rust/resolve/rust-ast-resolve-expr.h index 11a846ac8cd..a6f98cee1e8 100644 --- a/gcc/rust/resolve/rust-ast-resolve-expr.h +++ b/gcc/rust/resolve/rust-ast-resolve-expr.h @@ -34,89 +34,46 @@ public: const CanonicalPath &canonical_prefix); void visit (AST::TupleIndexExpr &expr) override; - void visit (AST::TupleExpr &expr) override; - void visit (AST::PathInExpression &expr) override; - void visit (AST::QualifiedPathInExpression &expr) override; - void visit (AST::ReturnExpr &expr) override; - void visit (AST::CallExpr &expr) override; - void visit (AST::MethodCallExpr &expr) override; - void visit (AST::AssignmentExpr &expr) override; - void visit (AST::IdentifierExpr &expr) override; - void visit (AST::ArithmeticOrLogicalExpr &expr) override; - void visit (AST::CompoundAssignmentExpr &expr) override; - void visit (AST::ComparisonExpr &expr) override; - void visit (AST::LazyBooleanExpr &expr) override; - void visit (AST::NegationExpr &expr) override; - void visit (AST::TypeCastExpr &expr) override; - void visit (AST::IfExpr &expr) override; - void visit (AST::IfExprConseqElse &expr) override; - void visit (AST::IfExprConseqIf &expr) override; - void visit (AST::IfLetExpr &expr) override; - void visit (AST::BlockExpr &expr) override; - void visit (AST::UnsafeBlockExpr &expr) override; - void visit (AST::ArrayElemsValues &elems) override; - void visit (AST::ArrayExpr &expr) override; - void visit (AST::ArrayIndexExpr &expr) override; - void visit (AST::ArrayElemsCopied &elems) override; - - // this this an empty struct constructor like 'S {}' void visit (AST::StructExprStruct &struct_expr) override; - - // this this a struct constructor with fields void visit (AST::StructExprStructFields &struct_expr) override; - void visit (AST::GroupedExpr &expr) override; - void visit (AST::FieldAccessExpr &expr) override; - void visit (AST::LoopExpr &expr) override; - void visit (AST::BreakExpr &expr) override; - void visit (AST::WhileLoopExpr &expr) override; - void visit (AST::ForLoopExpr &expr) override; - void visit (AST::ContinueExpr &expr) override; - void visit (AST::BorrowExpr &expr) override; - void visit (AST::DereferenceExpr &expr) override; - void visit (AST::MatchExpr &expr) override; - void visit (AST::RangeFromToExpr &expr) override; - void visit (AST::RangeFromExpr &expr) override; - void visit (AST::RangeToExpr &expr) override; - void visit (AST::RangeFullExpr &expr) override; - void visit (AST::RangeFromToInclExpr &expr) override; private: