From b195d61877e2d0370e616ebef1fb4378cd47b828 Mon Sep 17 00:00:00 2001 From: Jakub Dupak Date: Mon, 16 Oct 2023 15:25:29 +0200 Subject: [PATCH] gccrs: resolve: Resolve labelled block gcc/rust/ChangeLog: * resolve/rust-ast-resolve-expr.cc (ResolveExpr::visit): Resolve using loop logic. Signed-off-by: Jakub Dupak --- gcc/rust/resolve/rust-ast-resolve-expr.cc | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gcc/rust/resolve/rust-ast-resolve-expr.cc b/gcc/rust/resolve/rust-ast-resolve-expr.cc index 38d45de32f0..0b6f1b13788 100644 --- a/gcc/rust/resolve/rust-ast-resolve-expr.cc +++ b/gcc/rust/resolve/rust-ast-resolve-expr.cc @@ -303,6 +303,28 @@ ResolveExpr::visit (AST::BlockExpr &expr) resolver->push_new_type_rib (resolver->get_type_scope ().peek ()); resolver->push_new_label_rib (resolver->get_type_scope ().peek ()); + if (expr.has_label ()) + { + auto label = expr.get_label (); + if (label.get_lifetime ().get_lifetime_type () + != AST::Lifetime::LifetimeType::NAMED) + { + rust_error_at (label.get_locus (), + "Labels must be a named lifetime value"); + return; + } + + auto label_name = label.get_lifetime ().get_lifetime_name (); + auto label_lifetime_node_id = label.get_lifetime ().get_node_id (); + resolver->get_label_scope ().insert ( + CanonicalPath::new_seg (label.get_node_id (), label_name), + label_lifetime_node_id, label.get_locus (), false, Rib::ItemType::Label, + [&] (const CanonicalPath &, NodeId, location_t locus) -> void { + rust_error_at (label.get_locus (), "label redefined multiple times"); + rust_error_at (locus, "was defined here"); + }); + } + for (auto &s : expr.get_statements ()) { if (s->is_item ()) -- 2.11.4.GIT