From patchwork Tue Feb 21 12:01:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Cohen X-Patchwork-Id: 59995 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1833273wrn; Tue, 21 Feb 2023 04:29:01 -0800 (PST) X-Google-Smtp-Source: AK7set8V7PNx2aQZ8pobCsK4aIUu+lodo6GYI6RDezmvWDEWvHF0ok78WgPniHRJsLKUsXjSz+hn X-Received: by 2002:a17:906:1c56:b0:877:ef84:c7de with SMTP id l22-20020a1709061c5600b00877ef84c7demr11553845ejg.61.1676982541125; Tue, 21 Feb 2023 04:29:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676982541; cv=none; d=google.com; s=arc-20160816; b=p04XxwZuZAJnbj/NmVEvfrS66VE/t/RcU1bcrGfIEo7g7xr31Mzb9vK54bAbaYh5cv 4IC47Ncdu4LoAX8q0KjRcZaKADEGkXUcFmR5g6VnxGkE8IRMrVqwksmPazGv2iSEy8RK kOGGpUmJVEFuAIXuhchAU9HCbom6eMKCBlwsFhvkcOTH/oddeJWSxQjmk386XDWziMBX LRjqJgi4ax+LyRDxJqF2cgU4kqQDsq8pVjDjIatvjQRWVoKMjmiveQ8nN06W7xafwZG0 GwKuwJKSSnKrSrrDrDPV9IvXPV9Za5qETtCboOCpRDNR2c1u4rkbk9+SXQTA3O77ZKv2 LndA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature:dmarc-filter :delivered-to; bh=bfEEoTWgSuf+7mFnFkvC32aMhpMgIXo+rzbgt+hsUio=; b=y91LFamx5yIobuIeu1LU2OWKdABl2KEEEmA2IOpTKvyJiDhdfSWtoRlNd3PWFnq4SS kBxUbY+fvyUaCoBKzCIIne6UC8/tF2dFi21MmerK+B5QVT4oOkiZY2qSVzc1f0jqms94 5h8d/zlYdaNeYaPBkUYc/doTtKvTnArIIrMtVoXdcPJtQeSji3KauHFmZhSNfY0yxfr5 /cDs0E0quVEUYqXD+CvVxyhV7/yEdYmcBIj5CaD0pl3IFTmAyiZukJhst2t8MA1kzndk ZCaBFvCu6R3YkXWKRS+Y26eiPSxTFhI5XaNpK+3GjdsB2Lka5Wxxt2jmE//3BIbbm1cK Bwiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@embecosm.com header.s=google header.b=GxGRrg26; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id um4-20020a170907cb0400b008b1797df05fsi14294264ejc.391.2023.02.21.04.29.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 04:29:01 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@embecosm.com header.s=google header.b=GxGRrg26; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0E4F2391F6C8 for ; Tue, 21 Feb 2023 12:11:09 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by sourceware.org (Postfix) with ESMTPS id E73AA383E29E for ; Tue, 21 Feb 2023 12:04:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E73AA383E29E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com Received: by mail-wr1-x436.google.com with SMTP id c12so4163282wrw.1 for ; Tue, 21 Feb 2023 04:04:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=bfEEoTWgSuf+7mFnFkvC32aMhpMgIXo+rzbgt+hsUio=; b=GxGRrg26BUS2G15Eff0cxlEdujwN08ALk/rmH5YQX9WTj2TYLdSj4YMDn/UzOJs63a 2qDI3axGfvalcUg4ALrvPxDMHpTb5f7ogq65Z0lVP6ScqQgNMxh+eZLNrhR7HrC3q4vO pkN8ol/ZsAQUgfTpUnQUnhOXg1GPlS3Or394ZPbaCCrrJJQI+uXI0dvmBE4YwLHXCRwq /ousIoQBEW+tVFkI6az8A3whCKDWKqVoUjUVpL3a9HS2MTeKxNTgStGOVzgGBEiglzHO Cduj6H4Ro9Bd+DmF/mZfq3ILgRiQoylk5shtba0A/zFrnYovECCQVwKOD6lyTClmQZKV 7cfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=bfEEoTWgSuf+7mFnFkvC32aMhpMgIXo+rzbgt+hsUio=; b=eH+YTYozoBz58qpNIay6b3/ddUjLOjFe4kG8i7MKnLY0ZV7Qz79Y5HTzFsWlcPGZ6T BAMPRHx5lTgFSASZ4PZgYmyYH7h/DoV3t8exbtd5wFcP++1PxuIDpf8x/Omaa3MPxK/T xtvE8XSGyBdtouB0KPv6VKj5uN320GP+LGEpzp95n0WXjSzVNRBhMPWmD7lmaOfuqpIU /vMG2qUolkhMT9qCcOn2kHowJetDC6JPu/6THY6Bp0jsb6h7ayt3GWfLLdG4Yy9C60Z6 PFcdov5FdmPPSpUV+g/YERKn43MmrkyUUVtO4IC0VxIvqNusLjusiiIKu+Y5eTu8eCfi u7qw== X-Gm-Message-State: AO0yUKXXWfpemKJLYeHhTzyHohKr4b7q9SNf8LGO0fGWSZMJ5uoOA1s0 MPEd1S15Udsp5t6GYZJ179l1SHHSGK/jpfRCrw== X-Received: by 2002:a5d:5306:0:b0:2c5:62c8:5f43 with SMTP id e6-20020a5d5306000000b002c562c85f43mr2205431wrv.29.1676981040168; Tue, 21 Feb 2023 04:04:00 -0800 (PST) Received: from platypus.localdomain ([62.23.166.218]) by smtp.gmail.com with ESMTPSA id c15-20020adffb4f000000b002c55b0e6ef1sm5013811wrs.4.2023.02.21.04.03.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 04:03:59 -0800 (PST) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Philip Herron Subject: [committed 045/103] gccrs: Formatting cleanup in HIR lowering pattern Date: Tue, 21 Feb 2023 13:01:35 +0100 Message-Id: <20230221120230.596966-46-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230221120230.596966-1-arthur.cohen@embecosm.com> References: <20230221120230.596966-1-arthur.cohen@embecosm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-14.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: arthur.cohen@embecosm.com Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758443644764431783?= X-GMAIL-MSGID: =?utf-8?q?1758443644764431783?= From: Philip Herron gcc/rust/ChangeLog: * hir/rust-ast-lower-pattern.cc (ASTLoweringPattern::ASTLoweringPattern): Improve formatting. (ASTLoweringPattern::translate): Likewise. * hir/rust-ast-lower-pattern.h: Likewise. * resolve/rust-ast-resolve-expr.h: Likewise. --- 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 37bee38fd83..30a188286c8 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 f47699d15ea..8b191d56868 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 57beab700d7..60ae1720811 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: