carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 12:11:04 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Change Match clauses from pairs to classes (#858)

Browse Source 
Updates style of the Match class at the same time.
This commit is contained in:
Jon Meow
2021-09-29 13:36:54 -07:00
committed by GitHub
parent bf49f2efed
commit 25dce9fbcf
6 changed files with 57 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executable_semantics/ast/statement.cpp
+4 -4
View File
@@ -20,12 +20,12 @@ void Statement::PrintDepth(int depth, llvm::raw_ostream& out) const {
switch (Tag()) {
case Kind::Match: {
const auto& match = cast<Match>(*this);
out << "match (" << *match.Exp() << ") {";
out << "match (" << match.expression() << ") {";
if (depth < 0 || depth > 1) {
out << "\n";
for (auto& clause : match.Clauses()) {
out << "case " << *clause.first << " =>\n";
clause.second->PrintDepth(depth - 1, out);
for (auto& clause : match.clauses()) {
out << "case " << clause.pattern() << " =>\n";
clause.statement().PrintDepth(depth - 1, out);
out << "\n";
}
} else {
executable_semantics/ast/statement.h
+26 -11
View File
@@ -238,24 +238,39 @@ class Continue : public Statement {
class Match : public Statement {
public:
Match(SourceLocation loc, Nonnull<Expression*> exp,
std::vector<std::pair<Nonnull<Pattern*>, Nonnull<Statement*>>> clauses)
: Statement(Kind::Match, loc), exp(exp), clauses(std::move(clauses)) {}
class Clause {
public:
Clause(Nonnull<Pattern*> pattern, Nonnull<Statement*> statement)
: pattern_(pattern), statement_(statement) {}
auto pattern() const -> const Pattern& { return *pattern_; }
auto pattern() -> Pattern& { return *pattern_; }
auto statement() const -> const Statement& { return *statement_; }
auto statement() -> Statement& { return *statement_; }
private:
Nonnull<Pattern*> pattern_;
Nonnull<Statement*> statement_;
};
Match(SourceLocation loc, Nonnull<Expression*> expression,
std::vector<Clause> clauses)
: Statement(Kind::Match, loc),
expression_(expression),
clauses_(std::move(clauses)) {}
static auto classof(const Statement* stmt) -> bool {
return stmt->Tag() == Kind::Match;
}
auto Exp() const -> Nonnull<const Expression*> { return exp; }
auto Exp() -> Nonnull<Expression*> { return exp; }
auto Clauses() const
-> llvm::ArrayRef<std::pair<Nonnull<Pattern*>, Nonnull<Statement*>>> {
return clauses;
}
auto expression() const -> const Expression& { return *expression_; }
auto expression() -> Expression& { return *expression_; }
auto clauses() const -> llvm::ArrayRef<Clause> { return clauses_; }
auto clauses() -> llvm::MutableArrayRef<Clause> { return clauses_; }
private:
Nonnull<Expression*> exp;
std::vector<std::pair<Nonnull<Pattern*>, Nonnull<Statement*>>> clauses;
Nonnull<Expression*> expression_;
std::vector<Clause> clauses_;
};
// A continuation statement.