[gcc r14-7654] gccrs: collector: Make visitors public

Arthur Cohen cohenarthur@gcc.gnu.org
Tue Jan 16 17:50:57 GMT 2024


https://gcc.gnu.org/g:5c20c980f74d302a4c62590cb3da9b16d4199c37

commit r14-7654-g5c20c980f74d302a4c62590cb3da9b16d4199c37
Author: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
Date:   Thu May 18 13:58:28 2023 +0200

    gccrs: collector: Make visitors public
    
    Make all trivial visitor functions public so we could easily call the
    collection of an ast's subtree from any node.
    
    gcc/rust/ChangeLog:
    
            * ast/rust-ast-collector.h: Make trivial visitors public.
    
    Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>

Diff:
---
 gcc/rust/ast/rust-ast-collector.h | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/gcc/rust/ast/rust-ast-collector.h b/gcc/rust/ast/rust-ast-collector.h
index ae4f9fd9d13..91e49ca1496 100644
--- a/gcc/rust/ast/rust-ast-collector.h
+++ b/gcc/rust/ast/rust-ast-collector.h
@@ -41,22 +41,6 @@ public:
 private:
   std::vector<TokenPtr> &tokens;
 
-  /**
-   * Compatibility layer for using the visitor pattern on polymorphic classes
-   * with a unified overload syntax. This allows us to call `visit` both on
-   * types implementing `accept_vis` method and for classes for which the
-   * `visit` method is directly implemented.
-   */
-  template <typename T> void visit (std::unique_ptr<T> &node)
-  {
-    node->accept_vis (*this);
-  }
-
-  /**
-   * @see visit<std::unique_ptr<T>>
-   */
-  template <typename T> void visit (T &node);
-
   /**
    * Visit all items in given @collection, placing the separator in between but
    * not at the end.
@@ -106,6 +90,24 @@ private:
   void visit_closure_common (ClosureExpr &expr);
 
   void visit_loop_common (BaseLoopExpr &expr);
+
+public:
+  /**
+   * Compatibility layer for using the visitor pattern on polymorphic classes
+   * with a unified overload syntax. This allows us to call `visit` both on
+   * types implementing `accept_vis` method and for classes for which the
+   * `visit` method is directly implemented.
+   */
+  template <typename T> void visit (std::unique_ptr<T> &node)
+  {
+    node->accept_vis (*this);
+  }
+
+  /**
+   * @see visit<std::unique_ptr<T>>
+   */
+  template <typename T> void visit (T &node);
+
   void visit (LoopLabel &label);
 
   void visit (Literal &lit, Location locus = {});


More information about the Gcc-cvs mailing list