From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by sourceware.org (Postfix) with ESMTPS id 77E67385842F for ; Tue, 30 Jan 2024 12:10:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 77E67385842F Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 77E67385842F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::42a ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616659; cv=none; b=gscyf9L98sMHWr7xAy44l/7Qj7DpaDWlR1/kBVopyhLidykDf1Vyuhev0CKPIteLWIQ1R6DEORIg/7JgNvLtCtEKeGNqFxl4u+aXYdyLJOvW7lt4D6Gq7Ws7ZM8uQLjpH0HDwo2MlPQkKeN5dZGJSamqKwuylCHcRJ9WFH2JC04= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616659; c=relaxed/simple; bh=n4EHKhaThq/CKI8lAbQGTDgooTS1OuFvy1yLUeA8le0=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=HlPST+C87B0zlZREqMwZXXglTNnMY3MUpAy8UBTOrv9+xLhjz0L+0Y52FfGn0UQSUuL6Su7Saeapl3D823+cGNS3lf5IlMW5lRkX/O06dsYCODnrhGdutADjkhcqiqfnHnmLSsmsWPkRqwPjO+qmYTlnZPl6aTKB+ubLgGZQWow= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-33afcfc40e2so220089f8f.0 for ; Tue, 30 Jan 2024 04:10:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1706616654; x=1707221454; darn=gcc.gnu.org; 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=h+4MyOJXx2eww9qsPWju5OoyMFPjyNIzLy+HiMrddJw=; b=DrMvEZsBBxMDMd1hSEz7xW2teHQ/5LXt/j3Tt5VMPlHQJ/7N5Vs66Gz1fBLg+I03ec Fnn1iDGVodWzbO0e/imtTSrnuKpN5zafcl1kuerLtIc+nn+3itZbdUZR67TH3aArN6zw LgKedKTLAkYPZzbHXzSfVLXjsx15hhHREaGJsB5e8MdtaYiCTnL1bsEq6d20bVLeR+a8 2rr0WuZLrjFmaM4AOHJVrzNnVZX1OM050/7jgcvnZi1+3t505J1yshb16Oki+eAxCaPc BNGkzgG1o1jkaiozX1xlJdrIxwgG20WVu6/Xu2PqSiJJJYf3lhh1h6bvtqJ74D/g1MzZ v1Pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706616654; x=1707221454; 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=h+4MyOJXx2eww9qsPWju5OoyMFPjyNIzLy+HiMrddJw=; b=Uhi84OueV6RMndX29kNn0YzhiYS6h7FPcImTp1zB7Ux6Hl8C7z6m8R+VolOo0Iqi4I XhddcdRgTfD9/q9B/jgroC5s0OGVYeTCY9dEpBifDuLcXKKbHexkMmN+voM6xQr4m7Jm tQiGefTaAZ50higBjL2JansRTkOcigdm+jSjZULvm2y/dvdzlFYJ4gKD1ib2hpkzulkP pMZlqTX2QlOdYotNXVgh0HgLZTD5sdf23IPMJ7X07CX9RKeoMj22vTkn8TGSBkhIMUHT fANZ7wE8CU+YyvTFjq0Cu8MsNooZIy500d2v00clTB0qCI0pkLflgMoM4XA/PBy2ZkE/ uFEg== X-Gm-Message-State: AOJu0YxfZoW68Dp7Ae4EKmmVhKUjOfPPqSWCBKWpaB1NEqJh5AXRDAuz SrL6a0X65SKKPm/VvP+hGtAx+mxg4DuGZvtLg82R8uxVIAKn4snIIltQxmRocg== X-Google-Smtp-Source: AGHT+IGKjKlF4IGAlR7OoyITgKQm3/h5nE4Oh8fgQIowZAbuqWlyNdB5CtH2xfQoYdyyzWn0k79oHg== X-Received: by 2002:a5d:4e89:0:b0:337:cf50:5ff with SMTP id e9-20020a5d4e89000000b00337cf5005ffmr7032500wru.61.1706616654197; Tue, 30 Jan 2024 04:10:54 -0800 (PST) Received: from platypus.localdomain ([62.23.166.218]) by smtp.gmail.com with ESMTPSA id f9-20020a056000036900b00339307d9d31sm10569894wrf.112.2024.01.30.04.10.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 04:10:54 -0800 (PST) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Arthur Cohen Subject: [COMMITTED 006/101] gccrs: ast: Change *Path nodes API Date: Tue, 30 Jan 2024 13:06:22 +0100 Message-ID: <20240130121026.807464-9-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20240130121026.807464-2-arthur.cohen@embecosm.com> References: <20240130121026.807464-2-arthur.cohen@embecosm.com> Reply-To: arthur.cohen@embecosm.com MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-14.1 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,T_SCC_BODY_TEXT_LINE 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: Arthur Cohen gcc/rust/ChangeLog: * ast/rust-ast.h: Change Path API to be more consistent. * ast/rust-path.h: Likewise. * ast/rust-ast-collector.cc (TokenCollector::visit): Use new API. * resolve/rust-ast-resolve-item.cc (ResolveItem::visit): Likewise. * resolve/rust-ast-resolve-path.cc (ResolvePath::resolve_path): Likewise. * resolve/rust-forever-stack.hxx: Likewise. --- gcc/rust/ast/rust-ast-collector.cc | 2 +- gcc/rust/ast/rust-ast.h | 2 +- gcc/rust/ast/rust-path.h | 9 +++++++++ gcc/rust/resolve/rust-ast-resolve-item.cc | 2 +- gcc/rust/resolve/rust-ast-resolve-path.cc | 2 +- gcc/rust/resolve/rust-forever-stack.hxx | 7 ++++--- 6 files changed, 17 insertions(+), 7 deletions(-) diff --git a/gcc/rust/ast/rust-ast-collector.cc b/gcc/rust/ast/rust-ast-collector.cc index cb8dfd80016..7d3d3e204f7 100644 --- a/gcc/rust/ast/rust-ast-collector.cc +++ b/gcc/rust/ast/rust-ast-collector.cc @@ -191,7 +191,7 @@ TokenCollector::visit (SimplePathSegment &segment) { push (Rust::Token::make (SUPER, segment.get_locus ())); } - else if (segment.is_lower_self ()) + else if (segment.is_lower_self_seg ()) { push (Rust::Token::make (SELF, segment.get_locus ())); } diff --git a/gcc/rust/ast/rust-ast.h b/gcc/rust/ast/rust-ast.h index 4dc7f9710f3..47c02d6ac8b 100644 --- a/gcc/rust/ast/rust-ast.h +++ b/gcc/rust/ast/rust-ast.h @@ -399,7 +399,7 @@ public: { return as_string ().compare ("crate") == 0; } - bool is_lower_self () const { return as_string ().compare ("self") == 0; } + bool is_lower_self_seg () const { return as_string ().compare ("self") == 0; } bool is_big_self () const { return as_string ().compare ("Self") == 0; } }; diff --git a/gcc/rust/ast/rust-path.h b/gcc/rust/ast/rust-path.h index b76664fa7dd..ccac6303bb4 100644 --- a/gcc/rust/ast/rust-path.h +++ b/gcc/rust/ast/rust-path.h @@ -536,6 +536,7 @@ public: { return !has_generic_args () && get_ident_segment ().is_crate_segment (); } + bool is_lower_self_seg () const { return !has_generic_args () && get_ident_segment ().is_lower_self (); @@ -646,6 +647,14 @@ public: outer_attrs = std::move (new_attrs); } + NodeId get_pattern_node_id () const { return get_node_id (); } + + PathExprSegment &get_final_segment () { return get_segments ().back (); } + const PathExprSegment &get_final_segment () const + { + return get_segments ().back (); + } + protected: /* Use covariance to implement clone function as returning this object * rather than base */ diff --git a/gcc/rust/resolve/rust-ast-resolve-item.cc b/gcc/rust/resolve/rust-ast-resolve-item.cc index 1fc6b920c5e..eaee5bc8606 100644 --- a/gcc/rust/resolve/rust-ast-resolve-item.cc +++ b/gcc/rust/resolve/rust-ast-resolve-item.cc @@ -1031,7 +1031,7 @@ ResolveItem::visit (AST::UseDeclaration &use_item) if (!ok) continue; - const AST::SimplePathSegment &final_seg = path.get_final_segment (); + const AST::SimplePathSegment &final_seg = path.get_segments ().back (); auto decl = CanonicalPath::new_seg (resolved_node_id, final_seg.as_string ()); diff --git a/gcc/rust/resolve/rust-ast-resolve-path.cc b/gcc/rust/resolve/rust-ast-resolve-path.cc index fd2a844a506..9e982d0610e 100644 --- a/gcc/rust/resolve/rust-ast-resolve-path.cc +++ b/gcc/rust/resolve/rust-ast-resolve-path.cc @@ -367,7 +367,7 @@ ResolvePath::resolve_path (AST::SimplePath *expr) // is_first_segment ? "true" : "false", // is_final_segment ? "true" : "false"); if (resolved_node_id == UNKNOWN_NODEID && !is_first_segment - && is_final_segment && segment.is_lower_self ()) + && is_final_segment && segment.is_lower_self_seg ()) { resolved_node_id = previous_resolved_node_id; } diff --git a/gcc/rust/resolve/rust-forever-stack.hxx b/gcc/rust/resolve/rust-forever-stack.hxx index 8bdda67782a..5acdf06c770 100644 --- a/gcc/rust/resolve/rust-forever-stack.hxx +++ b/gcc/rust/resolve/rust-forever-stack.hxx @@ -313,7 +313,8 @@ ForeverStack::find_starting_point ( for (; !is_last (iterator, segments); iterator++) { auto seg = *iterator; - auto is_self_or_crate = seg.is_crate_path_seg () || seg.is_lower_self (); + auto is_self_or_crate + = seg.is_crate_path_seg () || seg.is_lower_self_seg (); // if we're after the first path segment and meet `self` or `crate`, it's // an error - we should only be seeing `super` keywords at this point @@ -327,7 +328,7 @@ ForeverStack::find_starting_point ( iterator++; break; } - if (seg.is_lower_self ()) + if (seg.is_lower_self_seg ()) { // do nothing and exit iterator++; @@ -371,7 +372,7 @@ ForeverStack::resolve_segments ( // check that we don't encounter *any* leading keywords afterwards if (check_leading_kw_at_start (seg, seg.is_crate_path_seg () || seg.is_super_path_seg () - || seg.is_lower_self ())) + || seg.is_lower_self_seg ())) return tl::nullopt; tl::optional::Node &> child = tl::nullopt; -- 2.42.1