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 <pierre-emmanuel.patry@embecosm.com>

diff --git a/gcc/rust/ast/rust-ast-tokenstream.cc b/gcc/rust/ast/rust-ast-tokenstream.cc
index 3150baaf1ccfeabe850b5f5c59a9225ba47cd7ef..bbc01a274eef12729f69cd5132b6a96cfd31d650 100644 (file)
--- 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 f43a68a04f51efba821e3d98caf72d60bcaae275..4a366a540d4b80c95d0304be8a39cf1aa9b63851 100644 (file)
--- 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 b1406483cd7c8256f8844bcc053da1a23cf5d0cc..38473d9f14c16e9483f87057fb90464dbe4c77c1 100644 (file)
--- 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;
   }