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

Convert Pattern and Expression to Ptr (#787)

Browse Source 
Sorry about the big change, this is hard to split. ParenContents is used by both, templated, and expects the same pointer type. While I could duplicate ParenContents with some ExpressionParenContents or PatternParenContents, that seems a little kludgy versus a single large change handling both. The worst of it is that Expression is already pretty sweeping, Pattern is really just incrementally adding.

That said, I believe this includes a couple fixes I found with incorrect use of dyn_cast in typecheck.cpp (checked nullptr at the wrong step in 2 code locations). There's also a missing `*` in member.cpp this caught. I adjust passing of expressions for Return due to nullness (I felt adding another constructor was the best solution).

I add a `.Release()` to BisonWrap due to things like `$3.first` needing some way to work through BIsonWrap. I felt this was better than `operator->`, but feel free to comment if you prefer the other path (`.Release()` conveniently lets me do pair unwrapping, so it felt a better solution).

I do add a TODO to think about better Ptr-to-Ptr cast<> support too, though, as that doesn't work cleanly with LLVM's infra. But so far it seems to only come up in one spot, so I'm not prioritizing it.
This commit is contained in:
Jon Meow
2021-08-27 09:16:20 -07:00
committed by GitHub
parent e93a361032
commit fd89bcb4aa
21 changed files with 394 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executable_semantics/ast/declaration.h
+9 -9
View File
@@ -97,7 +97,7 @@ class ChoiceDeclaration : public Declaration {
public:
ChoiceDeclaration(
SourceLocation loc, std::string name,
std::list<std::pair<std::string, const Expression*>> alternatives)
std::list<std::pair<std::string, Ptr<const Expression>>> alternatives)
: Declaration(Kind::ChoiceDeclaration, loc),
name(std::move(name)),
alternatives(std::move(alternatives)) {}
@@ -108,20 +108,20 @@ class ChoiceDeclaration : public Declaration {
auto Name() const -> const std::string& { return name; }
auto Alternatives() const
-> const std::list<std::pair<std::string, const Expression*>>& {
-> const std::list<std::pair<std::string, Ptr<const Expression>>>& {
return alternatives;
}
private:
std::string name;
std::list<std::pair<std::string, const Expression*>> alternatives;
std::list<std::pair<std::string, Ptr<const Expression>>> alternatives;
};
// Global variable definition implements the Declaration concept.
class VariableDeclaration : public Declaration {
public:
VariableDeclaration(SourceLocation loc, const BindingPattern* binding,
const Expression* initializer)
VariableDeclaration(SourceLocation loc, Ptr<const BindingPattern> binding,
Ptr<const Expression> initializer)
: Declaration(Kind::VariableDeclaration, loc),
binding(binding),
initializer(initializer) {}
@@ -130,15 +130,15 @@ class VariableDeclaration : public Declaration {
return decl->Tag() == Kind::VariableDeclaration;
}
auto Binding() const -> const BindingPattern* { return binding; }
auto Initializer() const -> const Expression* { return initializer; }
auto Binding() const -> Ptr<const BindingPattern> { return binding; }
auto Initializer() const -> Ptr<const Expression> { return initializer; }
private:
// TODO: split this into a non-optional name and a type, initialized by
// a constructor that takes a BindingPattern and handles errors like a
// missing name.
const BindingPattern* binding;
const Expression* initializer;
Ptr<const BindingPattern> binding;
Ptr<const Expression> initializer;
};
} // namespace Carbon
executable_semantics/ast/expression.cpp
+5 -4
View File
@@ -18,8 +18,9 @@ using llvm::cast;
auto ExpressionFromParenContents(
SourceLocation loc, const ParenContents<Expression>& paren_contents)
-> const Expression* {
std::optional<const Expression*> single_term = paren_contents.SingleTerm();
-> Ptr<const Expression> {
std::optional<Ptr<const Expression>> single_term =
paren_contents.SingleTerm();
if (single_term.has_value()) {
return *single_term;
} else {
@@ -29,8 +30,8 @@ auto ExpressionFromParenContents(
auto TupleExpressionFromParenContents(
SourceLocation loc, const ParenContents<Expression>& paren_contents)
-> const Expression* {
return global_arena->RawNew<TupleLiteral>(
-> Ptr<const Expression> {
return global_arena->New<TupleLiteral>(
loc, paren_contents.TupleElements<FieldInitializer>(loc));
}
executable_semantics/ast/expression.h
+32 -29
View File
@@ -63,24 +63,24 @@ class Expression {
// tuple otherwise.
auto ExpressionFromParenContents(
SourceLocation loc, const ParenContents<Expression>& paren_contents)
-> const Expression*;
-> Ptr<const Expression>;
// Converts paren_contents to an Expression, interpreting the parentheses as
// forming a tuple.
auto TupleExpressionFromParenContents(
SourceLocation loc, const ParenContents<Expression>& paren_contents)
-> const Expression*;
-> Ptr<const Expression>;
// A FieldInitializer represents the initialization of a single tuple field.
struct FieldInitializer {
FieldInitializer(std::string name, const Expression* expression)
FieldInitializer(std::string name, Ptr<const Expression> expression)
: name(std::move(name)), expression(expression) {}
// The field name. Cannot be empty.
std::string name;
// The expression that initializes the field.
const Expression* expression;
Ptr<const Expression> expression;
};
enum class Operator {
@@ -114,7 +114,8 @@ class IdentifierExpression : public Expression {
class FieldAccessExpression : public Expression {
public:
explicit FieldAccessExpression(SourceLocation loc,
const Expression* aggregate, std::string field)
Ptr<const Expression> aggregate,
std::string field)
: Expression(Kind::FieldAccessExpression, loc),
aggregate(aggregate),
field(std::move(field)) {}
@@ -123,18 +124,18 @@ class FieldAccessExpression : public Expression {
return exp->Tag() == Kind::FieldAccessExpression;
}
auto Aggregate() const -> const Expression* { return aggregate; }
auto Aggregate() const -> Ptr<const Expression> { return aggregate; }
auto Field() const -> const std::string& { return field; }
private:
const Expression* aggregate;
Ptr<const Expression> aggregate;
std::string field;
};
class IndexExpression : public Expression {
public:
explicit IndexExpression(SourceLocation loc, const Expression* aggregate,
const Expression* offset)
explicit IndexExpression(SourceLocation loc, Ptr<const Expression> aggregate,
Ptr<const Expression> offset)
: Expression(Kind::IndexExpression, loc),
aggregate(aggregate),
offset(offset) {}
@@ -143,12 +144,12 @@ class IndexExpression : public Expression {
return exp->Tag() == Kind::IndexExpression;
}
auto Aggregate() const -> const Expression* { return aggregate; }
auto Offset() const -> const Expression* { return offset; }
auto Aggregate() const -> Ptr<const Expression> { return aggregate; }
auto Offset() const -> Ptr<const Expression> { return offset; }
private:
const Expression* aggregate;
const Expression* offset;
Ptr<const Expression> aggregate;
Ptr<const Expression> offset;
};
class IntLiteral : public Expression {
@@ -226,8 +227,9 @@ class TupleLiteral : public Expression {
class PrimitiveOperatorExpression : public Expression {
public:
explicit PrimitiveOperatorExpression(SourceLocation loc, Operator op,
std::vector<const Expression*> arguments)
explicit PrimitiveOperatorExpression(
SourceLocation loc, Operator op,
std::vector<Ptr<const Expression>> arguments)
: Expression(Kind::PrimitiveOperatorExpression, loc),
op(op),
arguments(std::move(arguments)) {}
@@ -237,19 +239,19 @@ class PrimitiveOperatorExpression : public Expression {
}
auto Op() const -> Operator { return op; }
auto Arguments() const -> const std::vector<const Expression*>& {
auto Arguments() const -> const std::vector<Ptr<const Expression>>& {
return arguments;
}
private:
Operator op;
std::vector<const Expression*> arguments;
std::vector<Ptr<const Expression>> arguments;
};
class CallExpression : public Expression {
public:
explicit CallExpression(SourceLocation loc, const Expression* function,
const Expression* argument)
explicit CallExpression(SourceLocation loc, Ptr<const Expression> function,
Ptr<const Expression> argument)
: Expression(Kind::CallExpression, loc),
function(function),
argument(argument) {}
@@ -258,18 +260,19 @@ class CallExpression : public Expression {
return exp->Tag() == Kind::CallExpression;
}
auto Function() const -> const Expression* { return function; }
auto Argument() const -> const Expression* { return argument; }
auto Function() const -> Ptr<const Expression> { return function; }
auto Argument() const -> Ptr<const Expression> { return argument; }
private:
const Expression* function;
const Expression* argument;
Ptr<const Expression> function;
Ptr<const Expression> argument;
};
class FunctionTypeLiteral : public Expression {
public:
explicit FunctionTypeLiteral(SourceLocation loc, const Expression* parameter,
const Expression* return_type,
explicit FunctionTypeLiteral(SourceLocation loc,
Ptr<const Expression> parameter,
Ptr<const Expression> return_type,
bool is_omitted_return_type)
: Expression(Kind::FunctionTypeLiteral, loc),
parameter(parameter),
@@ -280,13 +283,13 @@ class FunctionTypeLiteral : public Expression {
return exp->Tag() == Kind::FunctionTypeLiteral;
}
auto Parameter() const -> const Expression* { return parameter; }
auto ReturnType() const -> const Expression* { return return_type; }
auto Parameter() const -> Ptr<const Expression> { return parameter; }
auto ReturnType() const -> Ptr<const Expression> { return return_type; }
auto IsOmittedReturnType() const -> bool { return is_omitted_return_type; }
private:
const Expression* parameter;
const Expression* return_type;
Ptr<const Expression> parameter;
Ptr<const Expression> return_type;
bool is_omitted_return_type;
};
executable_semantics/ast/expression_test.cpp
+22 -22
View File
@@ -33,7 +33,7 @@ static auto FakeSourceLoc(int line_num) -> SourceLocation {
TEST(ExpressionTest, EmptyAsExpression) {
ParenContents<Expression> contents = {.elements = {},
.has_trailing_comma = false};
const Expression* expression =
Ptr<const Expression> expression =
ExpressionFromParenContents(FakeSourceLoc(1), contents);
EXPECT_EQ(expression->SourceLoc(), FakeSourceLoc(1));
ASSERT_EQ(expression->Tag(), Expression::Kind::TupleLiteral);
@@ -43,7 +43,7 @@ TEST(ExpressionTest, EmptyAsExpression) {
TEST(ExpressionTest, EmptyAsTuple) {
ParenContents<Expression> contents = {.elements = {},
.has_trailing_comma = false};
const Expression* tuple =
Ptr<const Expression> tuple =
TupleExpressionFromParenContents(FakeSourceLoc(1), contents);
EXPECT_EQ(tuple->SourceLoc(), FakeSourceLoc(1));
ASSERT_EQ(tuple->Tag(), Expression::Kind::TupleLiteral);
@@ -59,11 +59,11 @@ TEST(ExpressionTest, UnaryNoCommaAsExpression) {
// ```
ParenContents<Expression> contents = {
.elements = {{.name = std::nullopt,
.term = global_arena->RawNew<IntLiteral>(FakeSourceLoc(2),
42)}},
.term =
global_arena->New<IntLiteral>(FakeSourceLoc(2), 42)}},
.has_trailing_comma = false};
const Expression* expression =
Ptr<const Expression> expression =
ExpressionFromParenContents(FakeSourceLoc(1), contents);
EXPECT_EQ(expression->SourceLoc(), FakeSourceLoc(2));
ASSERT_EQ(expression->Tag(), Expression::Kind::IntLiteral);
@@ -72,11 +72,11 @@ TEST(ExpressionTest, UnaryNoCommaAsExpression) {
TEST(ExpressionTest, UnaryNoCommaAsTuple) {
ParenContents<Expression> contents = {
.elements = {{.name = std::nullopt,
.term = global_arena->RawNew<IntLiteral>(FakeSourceLoc(2),
42)}},
.term =
global_arena->New<IntLiteral>(FakeSourceLoc(2), 42)}},
.has_trailing_comma = false};
const Expression* tuple =
Ptr<const Expression> tuple =
TupleExpressionFromParenContents(FakeSourceLoc(1), contents);
EXPECT_EQ(tuple->SourceLoc(), FakeSourceLoc(1));
ASSERT_EQ(tuple->Tag(), Expression::Kind::TupleLiteral);
@@ -87,11 +87,11 @@ TEST(ExpressionTest, UnaryNoCommaAsTuple) {
TEST(ExpressionTest, UnaryWithCommaAsExpression) {
ParenContents<Expression> contents = {
.elements = {{.name = std::nullopt,
.term = global_arena->RawNew<IntLiteral>(FakeSourceLoc(2),
42)}},
.term =
global_arena->New<IntLiteral>(FakeSourceLoc(2), 42)}},
.has_trailing_comma = true};
const Expression* expression =
Ptr<const Expression> expression =
ExpressionFromParenContents(FakeSourceLoc(1), contents);
EXPECT_EQ(expression->SourceLoc(), FakeSourceLoc(1));
ASSERT_EQ(expression->Tag(), Expression::Kind::TupleLiteral);
@@ -102,11 +102,11 @@ TEST(ExpressionTest, UnaryWithCommaAsExpression) {
TEST(ExpressionTest, UnaryWithCommaAsTuple) {
ParenContents<Expression> contents = {
.elements = {{.name = std::nullopt,
.term = global_arena->RawNew<IntLiteral>(FakeSourceLoc(2),
42)}},
.term =
global_arena->New<IntLiteral>(FakeSourceLoc(2), 42)}},
.has_trailing_comma = true};
const Expression* tuple =
Ptr<const Expression> tuple =
TupleExpressionFromParenContents(FakeSourceLoc(1), contents);
EXPECT_EQ(tuple->SourceLoc(), FakeSourceLoc(1));
ASSERT_EQ(tuple->Tag(), Expression::Kind::TupleLiteral);
@@ -118,13 +118,13 @@ TEST(ExpressionTest, BinaryAsExpression) {
ParenContents<Expression> contents = {
.elements = {{.name = std::nullopt,
.term =
global_arena->RawNew<IntLiteral>(FakeSourceLoc(2), 42)},
global_arena->New<IntLiteral>(FakeSourceLoc(2), 42)},
{.name = std::nullopt,
.term = global_arena->RawNew<IntLiteral>(FakeSourceLoc(3),
42)}},
.term =
global_arena->New<IntLiteral>(FakeSourceLoc(3), 42)}},
.has_trailing_comma = true};
const Expression* expression =
Ptr<const Expression> expression =
ExpressionFromParenContents(FakeSourceLoc(1), contents);
EXPECT_EQ(expression->SourceLoc(), FakeSourceLoc(1));
ASSERT_EQ(expression->Tag(), Expression::Kind::TupleLiteral);
@@ -136,13 +136,13 @@ TEST(ExpressionTest, BinaryAsTuple) {
ParenContents<Expression> contents = {
.elements = {{.name = std::nullopt,
.term =
global_arena->RawNew<IntLiteral>(FakeSourceLoc(2), 42)},
global_arena->New<IntLiteral>(FakeSourceLoc(2), 42)},
{.name = std::nullopt,
.term = global_arena->RawNew<IntLiteral>(FakeSourceLoc(3),
42)}},
.term =
global_arena->New<IntLiteral>(FakeSourceLoc(3), 42)}},
.has_trailing_comma = true};
const Expression* tuple =
Ptr<const Expression> tuple =
TupleExpressionFromParenContents(FakeSourceLoc(1), contents);
EXPECT_EQ(tuple->SourceLoc(), FakeSourceLoc(1));
ASSERT_EQ(tuple->Tag(), Expression::Kind::TupleLiteral);
executable_semantics/ast/function_definition.h
+6 -6
View File
@@ -18,15 +18,15 @@ namespace Carbon {
// For now, only generic parameters are supported.
struct GenericBinding {
std::string name;
const Expression* type;
Ptr<const Expression> type;
};
struct FunctionDefinition {
FunctionDefinition(SourceLocation source_location, std::string name,
std::vector<GenericBinding> deduced_params,
const TuplePattern* param_pattern,
const Pattern* return_type, bool is_omitted_return_type,
const Statement* body)
Ptr<const TuplePattern> param_pattern,
Ptr<const Pattern> return_type,
bool is_omitted_return_type, const Statement* body)
: source_location(source_location),
name(std::move(name)),
deduced_parameters(deduced_params),
@@ -42,8 +42,8 @@ struct FunctionDefinition {
SourceLocation source_location;
std::string name;
std::vector<GenericBinding> deduced_parameters;
const TuplePattern* param_pattern;
const Pattern* return_type;
Ptr<const TuplePattern> param_pattern;
Ptr<const Pattern> return_type;
bool is_omitted_return_type;
const Statement* body;
};
executable_semantics/ast/member.cpp
+1 -1
View File
@@ -15,7 +15,7 @@ void Member::Print(llvm::raw_ostream& out) const {
switch (Tag()) {
case Kind::FieldMember:
const auto& field = cast<FieldMember>(*this);
out << "var " << field.Binding() << ";\n";
out << "var " << *field.Binding() << ";\n";
break;
}
}
executable_semantics/ast/member.h
+3 -3
View File
@@ -51,20 +51,20 @@ class Member {
class FieldMember : public Member {
public:
FieldMember(SourceLocation loc, const BindingPattern* binding)
FieldMember(SourceLocation loc, Ptr<const BindingPattern> binding)
: Member(Kind::FieldMember, loc), binding(binding) {}
static auto classof(const Member* member) -> bool {
return member->Tag() == Kind::FieldMember;
}
auto Binding() const -> const BindingPattern* { return binding; }
auto Binding() const -> Ptr<const BindingPattern> { return binding; }
private:
// TODO: split this into a non-optional name and a type, initialized by
// a constructor that takes a BindingPattern and handles errors like a
// missing name.
const BindingPattern* binding;
Ptr<const BindingPattern> binding;
};
} // namespace Carbon
executable_semantics/ast/paren_contents.h
+4 -4
View File
@@ -28,16 +28,16 @@ template <typename Term>
struct ParenContents {
struct Element {
std::optional<std::string> name;
const Term* term;
Ptr<const Term> term;
};
// If this object represents a single term, with no name and no trailing
// comma, this method returns that term. This typically means the parentheses
// can be interpreted as grouping.
auto SingleTerm() const -> std::optional<const Term*>;
auto SingleTerm() const -> std::optional<Ptr<const Term>>;
// Converts `elements` to std::vector<TupleElement>. TupleElement must
// have a constructor that takes a std::string and a const Term*.
// have a constructor that takes a std::string and a Ptr<const Term>.
//
// TODO: Find a way to deduce TupleElement from Term.
template <typename TupleElement>
@@ -50,7 +50,7 @@ struct ParenContents {
// Implementation details only below here.
template <typename Term>
auto ParenContents<Term>::SingleTerm() const -> std::optional<const Term*> {
auto ParenContents<Term>::SingleTerm() const -> std::optional<Ptr<const Term>> {
if (elements.size() == 1 && !elements.front().name.has_value() &&
!has_trailing_comma) {
return elements.front().term;
executable_semantics/ast/pattern.cpp
+21 -14
View File
@@ -54,19 +54,19 @@ void Pattern::Print(llvm::raw_ostream& out) const {
}
}
TuplePattern::TuplePattern(const Expression* tuple_literal)
TuplePattern::TuplePattern(Ptr<const Expression> tuple_literal)
: Pattern(Kind::TuplePattern, tuple_literal->SourceLoc()) {
const auto& tuple = cast<TupleLiteral>(*tuple_literal);
for (const FieldInitializer& init : tuple.Fields()) {
fields.push_back(Field(
init.name, global_arena->RawNew<ExpressionPattern>(init.expression)));
init.name, global_arena->New<ExpressionPattern>(init.expression)));
}
}
auto PatternFromParenContents(SourceLocation loc,
const ParenContents<Pattern>& paren_contents)
-> const Pattern* {
std::optional<const Pattern*> single_term = paren_contents.SingleTerm();
-> Ptr<const Pattern> {
std::optional<Ptr<const Pattern>> single_term = paren_contents.SingleTerm();
if (single_term.has_value()) {
return *single_term;
} else {
@@ -76,24 +76,31 @@ auto PatternFromParenContents(SourceLocation loc,
auto TuplePatternFromParenContents(SourceLocation loc,
const ParenContents<Pattern>& paren_contents)
-> const TuplePattern* {
return global_arena->RawNew<TuplePattern>(
-> Ptr<const TuplePattern> {
return global_arena->New<TuplePattern>(
loc, paren_contents.TupleElements<TuplePattern::Field>(loc));
}
AlternativePattern::AlternativePattern(SourceLocation loc,
const Expression* alternative,
const TuplePattern* arguments)
: Pattern(Kind::AlternativePattern, loc), arguments(arguments) {
// Used by AlternativePattern for constructor initialization. Produces a helpful
// error for incorrect expressions, rather than letting a default cast error
// apply.
static const FieldAccessExpression& RequireFieldAccess(
Ptr<const Expression> alternative) {
if (alternative->Tag() != Expression::Kind::FieldAccessExpression) {
FATAL_PROGRAM_ERROR(alternative->SourceLoc())
<< "Alternative pattern must have the form of a field access.";
}
const auto& field_access = cast<FieldAccessExpression>(*alternative);
choice_type = field_access.Aggregate();
alternative_name = field_access.Field();
return cast<FieldAccessExpression>(*alternative);
}
AlternativePattern::AlternativePattern(SourceLocation loc,
Ptr<const Expression> alternative,
Ptr<const TuplePattern> arguments)
: Pattern(Kind::AlternativePattern, loc),
choice_type(RequireFieldAccess(alternative).Aggregate()),
alternative_name(RequireFieldAccess(alternative).Field()),
arguments(arguments) {}
auto ParenExpressionToParenPattern(const ParenContents<Expression>& contents)
-> ParenContents<Pattern> {
ParenContents<Pattern> result = {
@@ -101,7 +108,7 @@ auto ParenExpressionToParenPattern(const ParenContents<Expression>& contents)
for (const auto& element : contents.elements) {
result.elements.push_back(
{.name = element.name,
.term = global_arena->RawNew<ExpressionPattern>(element.term)});
.term = global_arena->New<ExpressionPattern>(element.term)});
}
return result;
}
executable_semantics/ast/pattern.h
+19 -19
View File
@@ -71,7 +71,7 @@ class AutoPattern : public Pattern {
class BindingPattern : public Pattern {
public:
BindingPattern(SourceLocation loc, std::optional<std::string> name,
const Pattern* type)
Ptr<const Pattern> type)
: Pattern(Kind::BindingPattern, loc), name(std::move(name)), type(type) {}
static auto classof(const Pattern* pattern) -> bool {
@@ -82,11 +82,11 @@ class BindingPattern : public Pattern {
auto Name() const -> const std::optional<std::string>& { return name; }
// The pattern specifying the type of values that this pattern matches.
auto Type() const -> const Pattern* { return type; }
auto Type() const -> Ptr<const Pattern> { return type; }
private:
std::optional<std::string> name;
const Pattern* type;
Ptr<const Pattern> type;
};
// A pattern that matches a tuple value field-wise.
@@ -94,14 +94,14 @@ class TuplePattern : public Pattern {
public:
// Represents a portion of a tuple pattern corresponding to a single field.
struct Field {
Field(std::string name, const Pattern* pattern)
Field(std::string name, Ptr<const Pattern> pattern)
: name(std::move(name)), pattern(pattern) {}
// The field name. Cannot be empty
std::string name;
// The pattern the field must match.
const Pattern* pattern;
Ptr<const Pattern> pattern;
};
TuplePattern(SourceLocation loc, std::vector<Field> fields)
@@ -111,7 +111,7 @@ class TuplePattern : public Pattern {
// ExpressionPattern.
//
// REQUIRES: tuple_literal->Tag() == Expression::Kind::TupleLiteral
explicit TuplePattern(const Expression* tuple_literal);
explicit TuplePattern(Ptr<const Expression> tuple_literal);
static auto classof(const Pattern* pattern) -> bool {
return pattern->Tag() == Kind::TuplePattern;
@@ -128,13 +128,13 @@ class TuplePattern : public Pattern {
// tuple otherwise.
auto PatternFromParenContents(SourceLocation loc,
const ParenContents<Pattern>& paren_contents)
-> const Pattern*;
-> Ptr<const Pattern>;
// Converts paren_contents to a TuplePattern, interpreting the parentheses as
// forming a tuple.
auto TuplePatternFromParenContents(SourceLocation loc,
const ParenContents<Pattern>& paren_contents)
-> const TuplePattern*;
-> Ptr<const TuplePattern>;
// Converts `contents` to ParenContents<Pattern> by replacing each Expression
// with an ExpressionPattern.
@@ -147,9 +147,9 @@ class AlternativePattern : public Pattern {
// Constructs an AlternativePattern that matches a value of the type
// specified by choice_type if it represents an alternative named
// alternative_name, and its arguments match `arguments`.
AlternativePattern(SourceLocation loc, const Expression* choice_type,
AlternativePattern(SourceLocation loc, Ptr<const Expression> choice_type,
std::string alternative_name,
const TuplePattern* arguments)
Ptr<const TuplePattern> arguments)
: Pattern(Kind::AlternativePattern, loc),
choice_type(choice_type),
alternative_name(std::move(alternative_name)),
@@ -157,30 +157,30 @@ class AlternativePattern : public Pattern {
// Constructs an AlternativePattern that matches the alternative specified
// by `alternative`, if its arguments match `arguments`.
AlternativePattern(SourceLocation loc, const Expression* alternative,
const TuplePattern* arguments);
AlternativePattern(SourceLocation loc, Ptr<const Expression> alternative,
Ptr<const TuplePattern> arguments);
static auto classof(const Pattern* pattern) -> bool {
return pattern->Tag() == Kind::AlternativePattern;
}
auto ChoiceType() const -> const Expression* { return choice_type; }
auto ChoiceType() const -> Ptr<const Expression> { return choice_type; }
auto AlternativeName() const -> const std::string& {
return alternative_name;
}
auto Arguments() const -> const TuplePattern* { return arguments; }
auto Arguments() const -> Ptr<const TuplePattern> { return arguments; }
private:
const Expression* choice_type;
Ptr<const Expression> choice_type;
std::string alternative_name;
const TuplePattern* arguments;
Ptr<const TuplePattern> arguments;
};
// A pattern that matches a value if it is equal to the value of a given
// expression.
class ExpressionPattern : public Pattern {
public:
ExpressionPattern(const Expression* expression)
ExpressionPattern(Ptr<const Expression> expression)
: Pattern(Kind::ExpressionPattern, expression->SourceLoc()),
expression(expression) {}
@@ -188,10 +188,10 @@ class ExpressionPattern : public Pattern {
return pattern->Tag() == Kind::ExpressionPattern;
}
auto Expression() const -> const Expression* { return expression; }
auto Expression() const -> Ptr<const Expression> { return expression; }
private:
const Carbon::Expression* expression;
Ptr<const Carbon::Expression> expression;
};
} // namespace Carbon
executable_semantics/ast/pattern_test.cpp
+28 -32
View File
@@ -22,7 +22,7 @@ using testing::IsEmpty;
// Matches a TuplePattern::Field named `name` whose `pattern` is an
// `AutoPattern`.
MATCHER_P(AutoFieldNamed, name, "") {
return arg.name == std::string(name) && isa<AutoPattern>(arg.pattern);
return arg.name == std::string(name) && isa<AutoPattern>(*arg.pattern);
}
static auto FakeSourceLoc(int line_num) -> SourceLocation {
@@ -32,16 +32,17 @@ static auto FakeSourceLoc(int line_num) -> SourceLocation {
TEST(PatternTest, EmptyAsPattern) {
ParenContents<Pattern> contents = {.elements = {},
.has_trailing_comma = false};
const Pattern* pattern = PatternFromParenContents(FakeSourceLoc(1), contents);
Ptr<const Pattern> pattern =
PatternFromParenContents(FakeSourceLoc(1), contents);
EXPECT_EQ(pattern->SourceLoc(), FakeSourceLoc(1));
ASSERT_TRUE(isa<TuplePattern>(pattern));
EXPECT_THAT(cast<TuplePattern>(pattern)->Fields(), IsEmpty());
ASSERT_TRUE(isa<TuplePattern>(*pattern));
EXPECT_THAT(cast<TuplePattern>(*pattern).Fields(), IsEmpty());
}
TEST(PatternTest, EmptyAsTuplePattern) {
ParenContents<Pattern> contents = {.elements = {},
.has_trailing_comma = false};
const TuplePattern* tuple =
Ptr<const TuplePattern> tuple =
TuplePatternFromParenContents(FakeSourceLoc(1), contents);
EXPECT_EQ(tuple->SourceLoc(), FakeSourceLoc(1));
EXPECT_THAT(tuple->Fields(), IsEmpty());
@@ -56,23 +57,22 @@ TEST(PatternTest, UnaryNoCommaAsPattern) {
// ```
ParenContents<Pattern> contents = {
.elements = {{.name = std::nullopt,
.term =
global_arena->RawNew<AutoPattern>(FakeSourceLoc(2))}},
.term = global_arena->New<AutoPattern>(FakeSourceLoc(2))}},
.has_trailing_comma = false};
const Pattern* pattern = PatternFromParenContents(FakeSourceLoc(1), contents);
Ptr<const Pattern> pattern =
PatternFromParenContents(FakeSourceLoc(1), contents);
EXPECT_EQ(pattern->SourceLoc(), FakeSourceLoc(2));
ASSERT_TRUE(isa<AutoPattern>(pattern));
ASSERT_TRUE(isa<AutoPattern>(*pattern));
}
TEST(PatternTest, UnaryNoCommaAsTuplePattern) {
ParenContents<Pattern> contents = {
.elements = {{.name = std::nullopt,
.term =
global_arena->RawNew<AutoPattern>(FakeSourceLoc(2))}},
.term = global_arena->New<AutoPattern>(FakeSourceLoc(2))}},
.has_trailing_comma = false};
const TuplePattern* tuple =
Ptr<const TuplePattern> tuple =
TuplePatternFromParenContents(FakeSourceLoc(1), contents);
EXPECT_EQ(tuple->SourceLoc(), FakeSourceLoc(1));
EXPECT_THAT(tuple->Fields(), ElementsAre(AutoFieldNamed("0")));
@@ -81,25 +81,24 @@ TEST(PatternTest, UnaryNoCommaAsTuplePattern) {
TEST(PatternTest, UnaryWithCommaAsPattern) {
ParenContents<Pattern> contents = {
.elements = {{.name = std::nullopt,
.term =
global_arena->RawNew<AutoPattern>(FakeSourceLoc(2))}},
.term = global_arena->New<AutoPattern>(FakeSourceLoc(2))}},
.has_trailing_comma = true};
const Pattern* pattern = PatternFromParenContents(FakeSourceLoc(1), contents);
Ptr<const Pattern> pattern =
PatternFromParenContents(FakeSourceLoc(1), contents);
EXPECT_EQ(pattern->SourceLoc(), FakeSourceLoc(1));
ASSERT_TRUE(isa<TuplePattern>(pattern));
EXPECT_THAT(cast<TuplePattern>(pattern)->Fields(),
ASSERT_TRUE(isa<TuplePattern>(*pattern));
EXPECT_THAT(cast<TuplePattern>(*pattern).Fields(),
ElementsAre(AutoFieldNamed("0")));
}
TEST(PatternTest, UnaryWithCommaAsTuplePattern) {
ParenContents<Pattern> contents = {
.elements = {{.name = std::nullopt,
.term =
global_arena->RawNew<AutoPattern>(FakeSourceLoc(2))}},
.term = global_arena->New<AutoPattern>(FakeSourceLoc(2))}},
.has_trailing_comma = true};
const TuplePattern* tuple =
Ptr<const TuplePattern> tuple =
TuplePatternFromParenContents(FakeSourceLoc(1), contents);
EXPECT_EQ(tuple->SourceLoc(), FakeSourceLoc(1));
EXPECT_THAT(tuple->Fields(), ElementsAre(AutoFieldNamed("0")));
@@ -108,31 +107,28 @@ TEST(PatternTest, UnaryWithCommaAsTuplePattern) {
TEST(PatternTest, BinaryAsPattern) {
ParenContents<Pattern> contents = {
.elements = {{.name = std::nullopt,
.term =
global_arena->RawNew<AutoPattern>(FakeSourceLoc(2))},
.term = global_arena->New<AutoPattern>(FakeSourceLoc(2))},
{.name = std::nullopt,
.term =
global_arena->RawNew<AutoPattern>(FakeSourceLoc(2))}},
.term = global_arena->New<AutoPattern>(FakeSourceLoc(2))}},
.has_trailing_comma = true};
const Pattern* pattern = PatternFromParenContents(FakeSourceLoc(1), contents);
Ptr<const Pattern> pattern =
PatternFromParenContents(FakeSourceLoc(1), contents);
EXPECT_EQ(pattern->SourceLoc(), FakeSourceLoc(1));
ASSERT_TRUE(isa<TuplePattern>(pattern));
EXPECT_THAT(cast<TuplePattern>(pattern)->Fields(),
ASSERT_TRUE(isa<TuplePattern>(*pattern));
EXPECT_THAT(cast<TuplePattern>(*pattern).Fields(),
ElementsAre(AutoFieldNamed("0"), AutoFieldNamed("1")));
}
TEST(PatternTest, BinaryAsTuplePattern) {
ParenContents<Pattern> contents = {
.elements = {{.name = std::nullopt,
.term =
global_arena->RawNew<AutoPattern>(FakeSourceLoc(2))},
.term = global_arena->New<AutoPattern>(FakeSourceLoc(2))},
{.name = std::nullopt,
.term =
global_arena->RawNew<AutoPattern>(FakeSourceLoc(2))}},
.term = global_arena->New<AutoPattern>(FakeSourceLoc(2))}},
.has_trailing_comma = true};
const TuplePattern* tuple =
Ptr<const TuplePattern> tuple =
TuplePatternFromParenContents(FakeSourceLoc(1), contents);
EXPECT_EQ(tuple->SourceLoc(), FakeSourceLoc(1));
EXPECT_THAT(tuple->Fields(),
executable_semantics/ast/statement.cpp
-7
View File
@@ -130,11 +130,4 @@ void Statement::PrintDepth(int depth, llvm::raw_ostream& out) const {
}
}
Return::Return(SourceLocation loc, const Expression* exp, bool is_omitted_exp)
: Statement(Kind::Return, loc),
exp(exp != nullptr ? exp : global_arena->RawNew<TupleLiteral>(loc)),
is_omitted_exp(is_omitted_exp) {
CHECK(exp != nullptr || is_omitted_exp);
}
} // namespace Carbon
executable_semantics/ast/statement.h
+39 -32
View File
@@ -11,6 +11,7 @@
#include "executable_semantics/ast/expression.h"
#include "executable_semantics/ast/pattern.h"
#include "executable_semantics/ast/source_location.h"
#include "executable_semantics/common/arena.h"
#include "llvm/Support/Compiler.h"
namespace Carbon {
@@ -57,57 +58,58 @@ class Statement {
class ExpressionStatement : public Statement {
public:
ExpressionStatement(SourceLocation loc, const Expression* exp)
ExpressionStatement(SourceLocation loc, Ptr<const Expression> exp)
: Statement(Kind::ExpressionStatement, loc), exp(exp) {}
static auto classof(const Statement* stmt) -> bool {
return stmt->Tag() == Kind::ExpressionStatement;
}
auto Exp() const -> const Expression* { return exp; }
auto Exp() const -> Ptr<const Expression> { return exp; }
private:
const Expression* exp;
Ptr<const Expression> exp;
};
class Assign : public Statement {
public:
Assign(SourceLocation loc, const Expression* lhs, const Expression* rhs)
Assign(SourceLocation loc, Ptr<const Expression> lhs,
Ptr<const Expression> rhs)
: Statement(Kind::Assign, loc), lhs(lhs), rhs(rhs) {}
static auto classof(const Statement* stmt) -> bool {
return stmt->Tag() == Kind::Assign;
}
auto Lhs() const -> const Expression* { return lhs; }
auto Rhs() const -> const Expression* { return rhs; }
auto Lhs() const -> Ptr<const Expression> { return lhs; }
auto Rhs() const -> Ptr<const Expression> { return rhs; }
private:
const Expression* lhs;
const Expression* rhs;
Ptr<const Expression> lhs;
Ptr<const Expression> rhs;
};
class VariableDefinition : public Statement {
public:
VariableDefinition(SourceLocation loc, const Pattern* pat,
const Expression* init)
VariableDefinition(SourceLocation loc, Ptr<const Pattern> pat,
Ptr<const Expression> init)
: Statement(Kind::VariableDefinition, loc), pat(pat), init(init) {}
static auto classof(const Statement* stmt) -> bool {
return stmt->Tag() == Kind::VariableDefinition;
}
auto Pat() const -> const Pattern* { return pat; }
auto Init() const -> const Expression* { return init; }
auto Pat() const -> Ptr<const Pattern> { return pat; }
auto Init() const -> Ptr<const Expression> { return init; }
private:
const Pattern* pat;
const Expression* init;
Ptr<const Pattern> pat;
Ptr<const Expression> init;
};
class If : public Statement {
public:
If(SourceLocation loc, const Expression* cond, const Statement* then_stmt,
If(SourceLocation loc, Ptr<const Expression> cond, const Statement* then_stmt,
const Statement* else_stmt)
: Statement(Kind::If, loc),
cond(cond),
@@ -118,29 +120,34 @@ class If : public Statement {
return stmt->Tag() == Kind::If;
}
auto Cond() const -> const Expression* { return cond; }
auto Cond() const -> Ptr<const Expression> { return cond; }
auto ThenStmt() const -> const Statement* { return then_stmt; }
auto ElseStmt() const -> const Statement* { return else_stmt; }
private:
const Expression* cond;
Ptr<const Expression> cond;
const Statement* then_stmt;
const Statement* else_stmt;
};
class Return : public Statement {
public:
Return(SourceLocation loc, const Expression* exp, bool is_omitted_exp);
explicit Return(SourceLocation loc)
: Return(loc, global_arena->New<TupleLiteral>(loc), true) {}
Return(SourceLocation loc, Ptr<const Expression> exp, bool is_omitted_exp)
: Statement(Kind::Return, loc),
exp(exp),
is_omitted_exp(is_omitted_exp) {}
static auto classof(const Statement* stmt) -> bool {
return stmt->Tag() == Kind::Return;
}
auto Exp() const -> const Expression* { return exp; }
auto Exp() const -> Ptr<const Expression> { return exp; }
auto IsOmittedExp() const -> bool { return is_omitted_exp; }
private:
const Expression* exp;
Ptr<const Expression> exp;
bool is_omitted_exp;
};
@@ -178,18 +185,18 @@ class Block : public Statement {
class While : public Statement {
public:
While(SourceLocation loc, const Expression* cond, const Statement* body)
While(SourceLocation loc, Ptr<const Expression> cond, const Statement* body)
: Statement(Kind::While, loc), cond(cond), body(body) {}
static auto classof(const Statement* stmt) -> bool {
return stmt->Tag() == Kind::While;
}
auto Cond() const -> const Expression* { return cond; }
auto Cond() const -> Ptr<const Expression> { return cond; }
auto Body() const -> const Statement* { return body; }
private:
const Expression* cond;
Ptr<const Expression> cond;
const Statement* body;
};
@@ -213,23 +220,23 @@ class Continue : public Statement {
class Match : public Statement {
public:
Match(SourceLocation loc, const Expression* exp,
std::list<std::pair<const Pattern*, const Statement*>>* clauses)
Match(SourceLocation loc, Ptr<const Expression> exp,
std::list<std::pair<Ptr<const Pattern>, const Statement*>>* clauses)
: Statement(Kind::Match, loc), exp(exp), clauses(clauses) {}
static auto classof(const Statement* stmt) -> bool {
return stmt->Tag() == Kind::Match;
}
auto Exp() const -> const Expression* { return exp; }
auto Exp() const -> Ptr<const Expression> { return exp; }
auto Clauses() const
-> const std::list<std::pair<const Pattern*, const Statement*>>* {
-> const std::list<std::pair<Ptr<const Pattern>, const Statement*>>* {
return clauses;
}
private:
const Expression* exp;
std::list<std::pair<const Pattern*, const Statement*>>* clauses;
Ptr<const Expression> exp;
std::list<std::pair<Ptr<const Pattern>, const Statement*>>* clauses;
};
// A continuation statement.
@@ -264,17 +271,17 @@ class Continuation : public Statement {
// __run <argument>;
class Run : public Statement {
public:
Run(SourceLocation loc, const Expression* argument)
Run(SourceLocation loc, Ptr<const Expression> argument)
: Statement(Kind::Run, loc), argument(argument) {}
static auto classof(const Statement* stmt) -> bool {
return stmt->Tag() == Kind::Run;
}
auto Argument() const -> const Expression* { return argument; }
auto Argument() const -> Ptr<const Expression> { return argument; }
private:
const Expression* argument;
Ptr<const Expression> argument;
};
// An await statement.