From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 4FB1F3895FFB; Wed, 8 Jun 2022 12:45:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4FB1F3895FFB 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] Implement name resolution for the IfLet expression. X-Act-Checkin: gcc X-Git-Author: antego X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: 03c21a08eb40b71e67da0c8ae83ed2c645fb76a3 X-Git-Newrev: a91b138bbc26408d97bbe870553b4276f8bf1f71 Message-Id: <20220608124545.4FB1F3895FFB@sourceware.org> Date: Wed, 8 Jun 2022 12:45:45 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jun 2022 12:45:45 -0000 https://gcc.gnu.org/g:a91b138bbc26408d97bbe870553b4276f8bf1f71 commit a91b138bbc26408d97bbe870553b4276f8bf1f71 Author: antego Date: Tue May 10 21:48:05 2022 +1000 Implement name resolution for the IfLet expression. Addresses #1177. Diff: --- gcc/rust/resolve/rust-ast-resolve-expr.cc | 25 +++++++++++++++++++++++++ gcc/rust/resolve/rust-ast-resolve-expr.h | 2 ++ 2 files changed, 27 insertions(+) diff --git a/gcc/rust/resolve/rust-ast-resolve-expr.cc b/gcc/rust/resolve/rust-ast-resolve-expr.cc index 71af8c23205..402c0488277 100644 --- a/gcc/rust/resolve/rust-ast-resolve-expr.cc +++ b/gcc/rust/resolve/rust-ast-resolve-expr.cc @@ -198,6 +198,31 @@ ResolveExpr::visit (AST::IfExprConseqIf &expr) resolve_expr (expr.get_conseq_if_expr ().get (), expr.get_node_id ()); } +void +ResolveExpr::visit (AST::IfLetExpr &expr) +{ + resolve_expr (expr.get_value_expr ().get (), expr.get_node_id ()); + + 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 &pattern : expr.get_patterns ()) + { + PatternDeclaration::go (pattern.get (), expr.get_node_id ()); + } + + resolve_expr (expr.get_if_block ().get (), expr.get_node_id ()); + + resolver->get_name_scope ().pop (); + resolver->get_type_scope ().pop (); + resolver->get_label_scope ().pop (); +} + void ResolveExpr::visit (AST::BlockExpr &expr) { diff --git a/gcc/rust/resolve/rust-ast-resolve-expr.h b/gcc/rust/resolve/rust-ast-resolve-expr.h index 34a318d6d04..72e608532fd 100644 --- a/gcc/rust/resolve/rust-ast-resolve-expr.h +++ b/gcc/rust/resolve/rust-ast-resolve-expr.h @@ -69,6 +69,8 @@ public: void visit (AST::IfExprConseqIf &expr) override; + void visit (AST::IfLetExpr &expr) override; + void visit (AST::BlockExpr &expr) override; void visit (AST::UnsafeBlockExpr &expr) override;