Skip to content

Add wrapper class for automatic node cloning #4350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
P-E-P merged 1 commit into from
Feb 21, 2026
Merged

Add wrapper class for automatic node cloning #4350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions gcc/rust/ast/rust-ast.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include "rust-location.h"
#include "rust-diagnostics.h"
#include "rust-keyword-values.h"
#include "rust-cloneable.h"

namespace Rust {
// TODO: remove typedefs and make actual types for these
Expand Down Expand Up @@ -2115,6 +2116,19 @@ struct Crate : public GlobContainer
};

} // namespace AST

template <> struct CloneableDelegate<std::unique_ptr<AST::Pattern>>
{
static std::unique_ptr<AST::Pattern>
clone (const std::unique_ptr<AST::Pattern> &other)
{
if (other == nullptr)
return nullptr;
else
return other->clone_pattern ();
}
};

} // namespace Rust

namespace std {
Expand Down
54 changes: 27 additions & 27 deletions gcc/rust/ast/rust-pattern.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ IdentifierPattern::as_string () const
str += variable_ident.as_string ();

if (has_subpattern ())
str += " @ " + subpattern->as_string ();
str += " @ " + subpattern.get ()->as_string ();

return str;
}
Expand All @@ -91,11 +91,11 @@ RangePattern::as_string () const
switch (range_kind)
{
case RangeKind::EXCLUDED:
return lower->as_string () + ".." + upper->as_string ();
return lower.get ()->as_string () + ".." + upper.get ()->as_string ();
case RangeKind::INCLUDED:
return lower->as_string () + "..=" + upper->as_string ();
return lower.get ()->as_string () + "..=" + upper.get ()->as_string ();
case RangeKind::ELLIPSIS:
return lower->as_string () + "..." + upper->as_string ();
return lower.get ()->as_string () + "..." + upper.get ()->as_string ();
default:
rust_unreachable ();
}
Expand All @@ -113,7 +113,7 @@ ReferencePattern::as_string () const
if (is_mut)
str += "mut ";

str += pattern->as_string ();
str += pattern.get ()->as_string ();

return str;
}
Expand All @@ -135,7 +135,7 @@ StructPatternFieldTuplePat::as_string () const

str += "\n";

str += std::to_string (index) + " : " + tuple_pattern->as_string ();
str += std::to_string (index) + " : " + tuple_pattern.get ()->as_string ();

return str;
}
Expand All @@ -148,7 +148,7 @@ StructPatternFieldIdentPat::as_string () const

str += "\n";

str += ident.as_string () + " : " + ident_pattern->as_string ();
str += ident.as_string () + " : " + ident_pattern.get ()->as_string ();

return str;
}
Expand Down Expand Up @@ -182,7 +182,7 @@ StructPatternElements::as_string () const
}
else
{
for (const auto &field : fields)
for (const auto &field : fields.get ())
str += "\n " + field->as_string ();
}

Expand Down Expand Up @@ -216,7 +216,7 @@ TupleStructItemsNoRest::as_string () const
{
std::string str;

for (const auto &pattern : patterns)
for (const auto &pattern : patterns.get ())
str += "\n " + pattern->as_string ();

return str;
Expand All @@ -227,24 +227,24 @@ TupleStructItemsHasRest::as_string () const
{
std::string str ("\n Lower patterns: ");

if (lower_patterns.empty ())
if (lower_patterns.get ().empty ())
{
str += "none";
}
else
{
for (const auto &lower : lower_patterns)
for (const auto &lower : lower_patterns.get ())
str += "\n " + lower->as_string ();
}

str += "\n Upper patterns: ";
if (upper_patterns.empty ())
if (upper_patterns.get ().empty ())
{
str += "none";
}
else
{
for (const auto &upper : upper_patterns)
for (const auto &upper : upper_patterns.get ())
str += "\n " + upper->as_string ();
}

Expand All @@ -258,7 +258,7 @@ TupleStructPattern::as_string () const

str += path.as_string ();

str += "\n Tuple struct items: " + items->as_string ();
str += "\n Tuple struct items: " + items.get ()->as_string ();

return str;
}
Expand All @@ -268,7 +268,7 @@ TuplePatternItemsNoRest::as_string () const
{
std::string str;

for (const auto &pattern : patterns)
for (const auto &pattern : patterns.get ())
str += "\n " + pattern->as_string ();

return str;
Expand All @@ -280,24 +280,24 @@ TuplePatternItemsHasRest::as_string () const
std::string str;

str += "\n Lower patterns: ";
if (lower_patterns.empty ())
if (lower_patterns.get ().empty ())
{
str += "none";
}
else
{
for (const auto &lower : lower_patterns)
for (const auto &lower : lower_patterns.get ())
str += "\n " + lower->as_string ();
}

str += "\n Upper patterns: ";
if (upper_patterns.empty ())
if (upper_patterns.get ().empty ())
{
str += "none";
}
else
{
for (const auto &upper : upper_patterns)
for (const auto &upper : upper_patterns.get ())
str += "\n " + upper->as_string ();
}

Expand All @@ -307,7 +307,7 @@ TuplePatternItemsHasRest::as_string () const
std::string
TuplePattern::as_string () const
{
return "TuplePattern: " + items->as_string ();
return "TuplePattern: " + items.get ()->as_string ();
}

std::string
Expand All @@ -331,7 +331,7 @@ SlicePatternItemsNoRest::as_string () const
{
std::string str;

for (const auto &pattern : patterns)
for (const auto &pattern : patterns.get ())
str += "\n " + pattern->as_string ();

return str;
Expand All @@ -343,24 +343,24 @@ SlicePatternItemsHasRest::as_string () const
std::string str;

str += "\n Lower patterns: ";
if (lower_patterns.empty ())
if (lower_patterns.get ().empty ())
{
str += "none";
}
else
{
for (const auto &lower : lower_patterns)
for (const auto &lower : lower_patterns.get ())
str += "\n " + lower->as_string ();
}

str += "\n Upper patterns: ";
if (upper_patterns.empty ())
if (upper_patterns.get ().empty ())
{
str += "none";
}
else
{
for (const auto &upper : upper_patterns)
for (const auto &upper : upper_patterns.get ())
str += "\n " + upper->as_string ();
}

Expand All @@ -370,15 +370,15 @@ SlicePatternItemsHasRest::as_string () const
std::string
SlicePattern::as_string () const
{
return "SlicePattern: " + items->as_string ();
return "SlicePattern: " + items.get ()->as_string ();
}

std::string
AltPattern::as_string () const
{
std::string str ("AltPattern: ");

for (const auto &pattern : alts)
for (const auto &pattern : alts.get ())
str += "\n " + pattern->as_string ();

return str;
Expand Down
Loading