Add locus getters

gcc/rust/ChangeLog:

	* ast/rust-expr.h: Add getter to locus field.
	* ast/rust-pattern.h (tokenid_to_rangekind): Likewise.
	* hir/tree/rust-hir-item.h: Likewise.
	* hir/tree/rust-hir-visibility.h: Likewise.

Signed-off-by: Pierre-Emmanuel Patry <[email protected]>

Author: P-E-P

gcc/rust/ast/rust-expr.h

@@ -1192,6 +1192,8 @@ class ArrayElemsValues : public ArrayElems
 
   std::string as_string () const override;
 
+  location_t get_locus () const { return locus; }
+
   void accept_vis (ASTVisitor &vis) override;
 
   // TODO: this mutable getter seems really dodgy. Think up better way.
@@ -1248,6 +1250,8 @@ class ArrayElemsCopied : public ArrayElems
 
   std::string as_string () const override;
 
+  location_t get_locus () const { return locus; }
+
   void accept_vis (ASTVisitor &vis) override;
 
   // TODO: is this better? Or is a "vis_block" better?
@@ -1777,6 +1781,8 @@ struct StructBase
 
   std::string as_string () const;
 
+  location_t get_locus () const { return locus; }
+
   // TODO: is this better? Or is a "vis_block" better?
   Expr &get_base_struct ()
   {

gcc/rust/ast/rust-pattern.h

@@ -948,7 +948,7 @@ class StructPattern : public Pattern
    * is empty). */
   bool has_struct_pattern_elems () const { return !elems.is_empty (); }
 
-  location_t get_locus () const override { return path.get_locus (); }
+  location_t get_locus () const override { return locus; }
 
   void accept_vis (ASTVisitor &vis) override;
 

gcc/rust/hir/tree/rust-hir-item.h

@@ -209,6 +209,8 @@ class LifetimeWhereClauseItem : public WhereClauseItem
 
   std::string as_string () const override;
 
+  location_t get_locus () const { return locus; }
+
   void accept_vis (HIRFullVisitor &vis) override;
 
   Lifetime &get_lifetime () { return lifetime; }

gcc/rust/hir/tree/rust-hir-visibility.h

@@ -73,6 +73,8 @@ struct Visibility
   }
 
   std::string as_string () const;
+
+  location_t get_locus () const { return locus; }
 };
 } // namespace HIR
 } // namespace Rust