Skip to content

Improve ExpandVisitor's completeness #4099

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve ExpandVisitor's completeness #4099

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
34 changes: 0 additions & 34 deletions gcc/rust/expand/rust-expand-visitor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,12 +597,6 @@ void
ExpandVisitor::visit (AST::MetaItemPathExpr &)
{}

void
ExpandVisitor::visit (AST::ErrorPropagationExpr &expr)
{
visit (expr.get_propagating_expr ());
}

void
ExpandVisitor::visit (AST::ArithmeticOrLogicalExpr &expr)
{
Expand Down Expand Up @@ -664,15 +658,6 @@ ExpandVisitor::visit (AST::CallExpr &expr)
maybe_expand_expr (param);
}

void
ExpandVisitor::visit (AST::MethodCallExpr &expr)
{
visit (expr.get_receiver_expr ());

for (auto &param : expr.get_params ())
maybe_expand_expr (param);
}

void
ExpandVisitor::visit (AST::ClosureExprInner &expr)
{
Expand Down Expand Up @@ -739,25 +724,6 @@ ExpandVisitor::visit (AST::IfLetExprConseqElse &expr)
visit (expr.get_else_block ());
}

void
ExpandVisitor::visit (AST::MatchExpr &expr)
{
visit (expr.get_scrutinee_expr ());

for (auto &match_case : expr.get_match_cases ())
{
auto &arm = match_case.get_arm ();

for (auto &pattern : arm.get_patterns ())
maybe_expand_pattern (pattern);

if (arm.has_match_arm_guard ())
maybe_expand_expr (arm.get_guard_expr_ptr ());

maybe_expand_expr (match_case.get_expr_ptr ());
}
}

void
ExpandVisitor::visit (AST::TupleExpr &expr)
{
Expand Down
29 changes: 24 additions & 5 deletions gcc/rust/expand/rust-expand-visitor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#ifndef RUST_EXPAND_VISITOR_H
#define RUST_EXPAND_VISITOR_H

#include "rust-ast-pointer-visitor.h"
#include "rust-ast-visitor.h"
#include "rust-item.h"
#include "rust-macro-expand.h"
Expand All @@ -36,7 +37,7 @@ bool is_derive (AST::Attribute &attr);
*/
bool is_builtin (AST::Attribute &attr);

class ExpandVisitor : public AST::DefaultASTVisitor
class ExpandVisitor : public AST::PointerVisitor
{
public:
ExpandVisitor (MacroExpander &expander)
Expand All @@ -46,7 +47,28 @@ class ExpandVisitor : public AST::DefaultASTVisitor
/* Expand all of the macro invocations currently contained in a crate */
void go (AST::Crate &crate);

using AST::DefaultASTVisitor::visit;
using AST::PointerVisitor::reseat;
using AST::PointerVisitor::visit;

void reseat (std::unique_ptr<AST::Expr> &ptr) override
{
maybe_expand_expr (ptr);
}

void reseat (std::unique_ptr<AST::Type> &ptr) override
{
maybe_expand_type (ptr);
}

void reseat (std::unique_ptr<AST::TypeNoBounds> &ptr) override
{
maybe_expand_type (ptr);
}

void reseat (std::unique_ptr<AST::Pattern> &ptr) override
{
maybe_expand_pattern (ptr);
}

/**
* Maybe expand a macro invocation in lieu of an expression, type or pattern.
Expand Down Expand Up @@ -214,7 +236,6 @@ class ExpandVisitor : public AST::DefaultASTVisitor
void visit (AST::AttrInputMacro &) override;
void visit (AST::MetaItemLitExpr &) override;
void visit (AST::MetaItemPathExpr &) override;
void visit (AST::ErrorPropagationExpr &expr) override;
void visit (AST::ArithmeticOrLogicalExpr &expr) override;
void visit (AST::ComparisonExpr &expr) override;
void visit (AST::LazyBooleanExpr &expr) override;
Expand All @@ -225,7 +246,6 @@ class ExpandVisitor : public AST::DefaultASTVisitor
void visit (AST::StructExprStruct &expr) override;

void visit (AST::CallExpr &expr) override;
void visit (AST::MethodCallExpr &expr) override;
void visit (AST::ClosureExprInner &expr) override;

void visit (AST::BlockExpr &expr) override;
Expand All @@ -236,7 +256,6 @@ class ExpandVisitor : public AST::DefaultASTVisitor
void visit (AST::IfExprConseqElse &expr) override;
void visit (AST::IfLetExpr &expr) override;
void visit (AST::IfLetExprConseqElse &expr) override;
void visit (AST::MatchExpr &expr) override;
void visit (AST::TupleExpr &expr) override;
void visit (AST::TypeParam &param) override;
void visit (AST::LifetimeWhereClauseItem &) override;
Expand Down
Loading