diff options
author | Jakub Dupak <dev@jakubdupak.com> | 2022-11-04 23:30:24 +0100 |
---|---|---|
committer | Arthur Cohen <arthur.cohen@embecosm.com> | 2023-02-21 12:36:45 +0100 |
commit | 907d11194ed94c129cfd2c38c6acc2e3336d6949 (patch) | |
tree | 681b5c75c11dd61b936ca65e9378c2140489ef3b /gcc | |
parent | 85f69a9b6abd398f6344135d8094cf8256c6279c (diff) | |
download | gcc-907d11194ed94c129cfd2c38c6acc2e3336d6949.zip gcc-907d11194ed94c129cfd2c38c6acc2e3336d6949.tar.gz gcc-907d11194ed94c129cfd2c38c6acc2e3336d6949.tar.bz2 |
gccrs: ast: add visit overload for references
This is currently needed for lifetimes to use the existing infrastructure.
gcc/rust/ChangeLog:
* ast/rust-ast-dump.cc (Dump::visit): Add new reference visitor wrapper.
* ast/rust-ast-dump.h: Declare it.
* ast/rust-item.h: Add mutable visibility getters.
Signed-off-by: Jakub Dupak <dev@jakubdupak.com>
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/rust/ast/rust-ast-dump.cc | 15 | ||||
-rw-r--r-- | gcc/rust/ast/rust-ast-dump.h | 11 | ||||
-rw-r--r-- | gcc/rust/ast/rust-item.h | 4 |
3 files changed, 23 insertions, 7 deletions
diff --git a/gcc/rust/ast/rust-ast-dump.cc b/gcc/rust/ast/rust-ast-dump.cc index df42481..16c4a79 100644 --- a/gcc/rust/ast/rust-ast-dump.cc +++ b/gcc/rust/ast/rust-ast-dump.cc @@ -66,6 +66,13 @@ Dump::visit (std::unique_ptr<T> &node) template <typename T> void +Dump::visit (T &node) +{ + node.accept_vis (*this); +} + +template <typename T> +void Dump::visit_items_joined_by_separator (T &collection, const std::string &separator, size_t start_offset, size_t end_offset) @@ -129,7 +136,7 @@ Dump::visit (FunctionParam ¶m) } void -Dump::visit (const Attribute &attrib) +Dump::visit (Attribute &attrib) { stream << "#["; visit_items_joined_by_separator (attrib.get_path ().get_segments (), "::"); @@ -158,13 +165,13 @@ Dump::visit (const Attribute &attrib) } void -Dump::visit (const SimplePathSegment &segment) +Dump::visit (SimplePathSegment &segment) { stream << segment.get_segment_name (); } void -Dump::visit (const Visibility &vis) +Dump::visit (Visibility &vis) { switch (vis.get_vis_type ()) { @@ -1099,7 +1106,7 @@ Dump::visit (TraitItemType &item) void Dump::visit (Trait &trait) { - for (const auto &attr : trait.get_outer_attrs ()) + for (auto &attr : trait.get_outer_attrs ()) { visit (attr); stream << "\n" << indentation; diff --git a/gcc/rust/ast/rust-ast-dump.h b/gcc/rust/ast/rust-ast-dump.h index 13c9212..57419b7 100644 --- a/gcc/rust/ast/rust-ast-dump.h +++ b/gcc/rust/ast/rust-ast-dump.h @@ -81,6 +81,11 @@ private: template <typename T> void visit (std::unique_ptr<T> &node); /** + * @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. * Start and end offset allow to visit only a "slice" from the collection. @@ -122,12 +127,12 @@ private: std::unique_ptr<BlockExpr> &block); void visit (FunctionParam ¶m); - void visit (const Attribute &attrib); - void visit (const Visibility &vis); + void visit (Attribute &attrib); + void visit (Visibility &vis); void visit (std::vector<std::unique_ptr<GenericParam>> ¶ms); void visit (TupleField &field); void visit (StructField &field); - void visit (const SimplePathSegment &segment); + void visit (SimplePathSegment &segment); void visit (NamedFunctionParam ¶m); void visit (MacroRule &rule); diff --git a/gcc/rust/ast/rust-item.h b/gcc/rust/ast/rust-item.h index 17d11e4..4e237f2 100644 --- a/gcc/rust/ast/rust-item.h +++ b/gcc/rust/ast/rust-item.h @@ -908,6 +908,7 @@ public: FunctionQualifiers get_qualifiers () { return qualifiers; } + Visibility &get_visibility () { return vis; } const Visibility &get_visibility () const { return vis; } protected: @@ -1982,6 +1983,7 @@ public: return field_type; } + Visibility &get_visibility () { return visibility; } const Visibility &get_visibility () const { return visibility; } NodeId get_node_id () const { return node_id; } @@ -2116,6 +2118,7 @@ public: NodeId get_node_id () const { return node_id; } + Visibility &get_visibility () { return visibility; } const Visibility &get_visibility () const { return visibility; } Location get_locus () const { return locus; } @@ -4157,6 +4160,7 @@ public: Location get_locus () const { return locus; } + Visibility &get_visibility () { return visibility; } const Visibility &get_visibility () const { return visibility; } ExternalFunctionItem ( |