diff options
| author | Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com> | 2023-03-24 11:42:19 +0100 |
|---|---|---|
| committer | Arthur Cohen <arthur.cohen@embecosm.com> | 2023-03-30 16:48:27 +0200 |
| commit | ea248799f7864094946c90ae793efb55d03ffc64 (patch) | |
| tree | b6640034f7ca3950c46f10cb5992bd993ede6e6d | |
| parent | f580c1f44c47b7b06d2a87ba4dfb3384082cc881 (diff) | |
| download | gcc-ea248799f7864094946c90ae793efb55d03ffc64.zip gcc-ea248799f7864094946c90ae793efb55d03ffc64.tar.gz gcc-ea248799f7864094946c90ae793efb55d03ffc64.tar.bz2 | |
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 <pierre-emmanuel.patry@embecosm.com>
| -rw-r--r-- | gcc/rust/ast/rust-ast-tokenstream.cc | 2 | ||||
| -rw-r--r-- | gcc/rust/ast/rust-ast.cc | 2 | ||||
| -rw-r--r-- | gcc/rust/ast/rust-ast.h | 10 |
3 files changed, 7 insertions, 7 deletions
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 bb3562a..dd73e5e 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 a4da389..0ce3ff9 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<SimplePathSegment> segments; Location locus; NodeId node_id; @@ -377,7 +377,7 @@ public: SimplePath (std::vector<SimplePathSegment> 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; } |