From ac0132918680200f265bf96fe87644a2cb81c22b Mon Sep 17 00:00:00 2001 From: Pierre-Emmanuel Patry Date: Fri, 24 Mar 2023 11:42:19 +0100 Subject: gccrs: ast: Refactor SimplePath attribute name The getter name was overly complicated and long, this could be refactored to a shorter name. gcc/rust/ChangeLog: * ast/rust-ast-tokenstream.cc (TokenStream::visit): Change getter name. * ast/rust-ast.cc (SimplePath::as_string): Change attribute name. * ast/rust-ast.h (class SimplePath): Refactor attribute name and change getter name. Signed-off-by: Pierre-Emmanuel Patry --- gcc/rust/ast/rust-ast-tokenstream.cc | 2 +- gcc/rust/ast/rust-ast.cc | 2 +- gcc/rust/ast/rust-ast.h | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'gcc/rust/ast') diff --git a/gcc/rust/ast/rust-ast-tokenstream.cc b/gcc/rust/ast/rust-ast-tokenstream.cc index 3150baa..bbc01a2 100644 --- a/gcc/rust/ast/rust-ast-tokenstream.cc +++ b/gcc/rust/ast/rust-ast-tokenstream.cc @@ -182,7 +182,7 @@ TokenStream::visit (Attribute &attrib) void TokenStream::visit (SimplePath &path) { - if (path.get_has_opening_scope_resolution ()) + if (path.has_opening_scope_resolution ()) { tokens.push_back ( Rust::Token::make (SCOPE_RESOLUTION, path.get_locus ())); diff --git a/gcc/rust/ast/rust-ast.cc b/gcc/rust/ast/rust-ast.cc index f43a68a..4a366a5 100644 --- a/gcc/rust/ast/rust-ast.cc +++ b/gcc/rust/ast/rust-ast.cc @@ -272,7 +272,7 @@ std::string SimplePath::as_string () const { std::string path; - if (has_opening_scope_resolution) + if (opening_scope_resolution) path = "::"; // crappy hack because doing proper for loop would be more code diff --git a/gcc/rust/ast/rust-ast.h b/gcc/rust/ast/rust-ast.h index b140648..38473d9 100644 --- a/gcc/rust/ast/rust-ast.h +++ b/gcc/rust/ast/rust-ast.h @@ -367,7 +367,7 @@ public: // A simple path without generic or type arguments class SimplePath { - bool has_opening_scope_resolution; + bool opening_scope_resolution; std::vector segments; Location locus; NodeId node_id; @@ -377,7 +377,7 @@ public: SimplePath (std::vector path_segments, bool has_opening_scope_resolution = false, Location locus = Location ()) - : has_opening_scope_resolution (has_opening_scope_resolution), + : opening_scope_resolution (has_opening_scope_resolution), segments (std::move (path_segments)), locus (locus), node_id (Analysis::Mappings::get ()->get_next_node_id ()) {} @@ -393,9 +393,9 @@ public: std::string as_string () const; - bool get_has_opening_scope_resolution () const + bool has_opening_scope_resolution () const { - return has_opening_scope_resolution; + return opening_scope_resolution; } Location get_locus () const { return locus; } @@ -406,7 +406,7 @@ public: // path-to-string comparison operator bool operator== (const std::string &rhs) const { - return !has_opening_scope_resolution && segments.size () == 1 + return !opening_scope_resolution && segments.size () == 1 && segments[0].as_string () == rhs; } -- cgit v1.1