From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by sourceware.org (Postfix) with ESMTPS id D6169384476E for ; Tue, 21 Feb 2023 12:04:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D6169384476E 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-x42c.google.com with SMTP id o4so4164949wrs.4 for ; Tue, 21 Feb 2023 04:04:01 -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=Mx4M+hOcIm/m8fLsqZd3LiXt4cjdnBO461A2GXm7wMU=; b=QayNPtpNaCSzCcAyz0BBiXlwyiD9ndNrAb+Lba5ODogKQb04xSKvqiyI62OpUNiJdy 1mWZTGZH8dTbOA4L0HCogbk5YKwdwPSJSmyuwLa8/ON/Y9TqH1XBqRQfgWy7jHj7/iqe rbrMgWxmubFSD+aQE28kID/XIWL3JTefydqdcvu6xM/eUdk3pCjxBea2Xw2krnChTJNO hrBshSFFsytyLziSIkilIwNic5gX66OxVYZBa/NyQPIHU0TWkcMFcVgGv0ZqJRvr/kwH GqwZVJTS50FtiA8eczBcjs2lQGb283KJBOWJYUmcDYfJiAYMYtmbUWHZs7mXQCygZH0R YNUA== 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=Mx4M+hOcIm/m8fLsqZd3LiXt4cjdnBO461A2GXm7wMU=; b=2K2qltCU6M3NohdDiuSz+H60jCTVpHxW5bBGwvhnTgAR9poKOY/q6PETr+dbP0Sdai Zy3QHREFYDK0/nUWDhUBruLq54SOPG2BfFJPNqRtBdtP8tSGcS6+ojjy97YJRnQn0m44 lsLXDzCyS4BKeGbYMQXQQHSgOubYPMojTtZq6aTu76lupWG0xZc3yt1TpqrDgxpoUACs xuRh8p1A/9i2HD4CREah5Y2tEreFBznuRd052D4I4WX3Bbs3enJwKEh1jrW9I6Hh+jeJ 6bzqGwnG58AVizE/59Nq1TRcGpxcAfGAlBQr7I22ccKkW5qo3JfuYNMNxsz1BDKu8xfy 5BlA== X-Gm-Message-State: AO0yUKVuyIYnLaabz8adZS7007bo9XPMPe9ZkGdtNa3GQgnEvYvEHGum J3bUPs9YeDnuWZAKAsufPmzl X-Google-Smtp-Source: AK7set/v/rEkRdlLlnRiilKKO0FvqC3hVvvyAKcgqSUyYy0x1iIUDKVC9IhTYVOLGJOQyJ2bKeEmYQ== X-Received: by 2002:a5d:59a9:0:b0:2bf:95d6:4789 with SMTP id p9-20020a5d59a9000000b002bf95d64789mr3973049wrr.2.1676981041483; Tue, 21 Feb 2023 04:04:01 -0800 (PST) Received: from platypus.localdomain ([62.23.166.218]) by smtp.gmail.com with ESMTPSA id c15-20020adffb4f000000b002c55b0e6ef1sm5013811wrs.4.2023.02.21.04.04.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 04:04:01 -0800 (PST) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Philip Herron Subject: [committed 046/103] gccrs: Add name resolution for closures Date: Tue, 21 Feb 2023 13:01:36 +0100 Message-Id: <20230221120230.596966-47-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> Reply-To: arthur.cohen@embecosm.com MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 List-Id: From: Philip Herron gcc/rust/ChangeLog: * resolve/rust-ast-resolve-expr.cc (ResolveExpr::visit): Visit closure properly when name resolving. (ResolveExpr::resolve_closure_param): Implement closure name resolving. * resolve/rust-ast-resolve-expr.h: Declare visitors for closure types. --- gcc/rust/resolve/rust-ast-resolve-expr.cc | 58 +++++++++++++++++++++++ gcc/rust/resolve/rust-ast-resolve-expr.h | 5 ++ 2 files changed, 63 insertions(+) diff --git a/gcc/rust/resolve/rust-ast-resolve-expr.cc b/gcc/rust/resolve/rust-ast-resolve-expr.cc index 40d4af09444..8ece5b63b6d 100644 --- a/gcc/rust/resolve/rust-ast-resolve-expr.cc +++ b/gcc/rust/resolve/rust-ast-resolve-expr.cc @@ -565,6 +565,64 @@ ResolveExpr::visit (AST::RangeFromToInclExpr &expr) ResolveExpr::go (expr.get_to_expr ().get (), prefix, canonical_prefix); } +void +ResolveExpr::visit (AST::ClosureExprInner &expr) +{ + NodeId scope_node_id = expr.get_node_id (); + resolver->get_name_scope ().push (scope_node_id); + resolver->get_type_scope ().push (scope_node_id); + resolver->get_label_scope ().push (scope_node_id); + resolver->push_new_name_rib (resolver->get_name_scope ().peek ()); + resolver->push_new_type_rib (resolver->get_type_scope ().peek ()); + resolver->push_new_label_rib (resolver->get_type_scope ().peek ()); + + for (auto &p : expr.get_params ()) + { + resolve_closure_param (p); + } + + ResolveExpr::go (expr.get_definition_expr ().get (), prefix, + canonical_prefix); + + resolver->get_name_scope ().pop (); + resolver->get_type_scope ().pop (); + resolver->get_label_scope ().pop (); +} + +void +ResolveExpr::visit (AST::ClosureExprInnerTyped &expr) +{ + NodeId scope_node_id = expr.get_node_id (); + resolver->get_name_scope ().push (scope_node_id); + resolver->get_type_scope ().push (scope_node_id); + resolver->get_label_scope ().push (scope_node_id); + resolver->push_new_name_rib (resolver->get_name_scope ().peek ()); + resolver->push_new_type_rib (resolver->get_type_scope ().peek ()); + resolver->push_new_label_rib (resolver->get_type_scope ().peek ()); + + for (auto &p : expr.get_params ()) + { + resolve_closure_param (p); + } + + ResolveType::go (expr.get_return_type ().get ()); + ResolveExpr::go (expr.get_definition_block ().get (), prefix, + canonical_prefix); + + resolver->get_name_scope ().pop (); + resolver->get_type_scope ().pop (); + resolver->get_label_scope ().pop (); +} + +void +ResolveExpr::resolve_closure_param (AST::ClosureParam ¶m) +{ + PatternDeclaration::go (param.get_pattern ().get ()); + + if (param.has_type_given ()) + ResolveType::go (param.get_type ().get ()); +} + ResolveExpr::ResolveExpr (const CanonicalPath &prefix, const CanonicalPath &canonical_prefix) : ResolverBase (), prefix (prefix), canonical_prefix (canonical_prefix) diff --git a/gcc/rust/resolve/rust-ast-resolve-expr.h b/gcc/rust/resolve/rust-ast-resolve-expr.h index 60ae1720811..9e3e7750119 100644 --- a/gcc/rust/resolve/rust-ast-resolve-expr.h +++ b/gcc/rust/resolve/rust-ast-resolve-expr.h @@ -75,6 +75,11 @@ public: void visit (AST::RangeToExpr &expr) override; void visit (AST::RangeFullExpr &expr) override; void visit (AST::RangeFromToInclExpr &expr) override; + void visit (AST::ClosureExprInner &expr) override; + void visit (AST::ClosureExprInnerTyped &expr) override; + +protected: + void resolve_closure_param (AST::ClosureParam ¶m); private: ResolveExpr (const CanonicalPath &prefix, -- 2.39.1