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

Update IfExpression to follow AST conventions (#1167)

Browse Source
This commit is contained in:
Geoff Romer
2022-04-12 12:28:48 -07:00
committed by GitHub
parent baf832b18b
commit 883f2a3ecd
6 changed files with 31 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executable_semantics/ast/expression.cpp
+2 -3
View File
@@ -161,9 +161,8 @@ void Expression::Print(llvm::raw_ostream& out) const {
break;
case ExpressionKind::IfExpression: {
const auto& if_expr = cast<IfExpression>(*this);
out << "if " << *if_expr.condition() << " then "
<< *if_expr.then_expression() << " else "
<< *if_expr.else_expression();
out << "if " << if_expr.condition() << " then "
<< if_expr.then_expression() << " else " << if_expr.else_expression();
break;
}
case ExpressionKind::UnimplementedExpression: {
executable_semantics/ast/expression.h
+10 -5
View File
@@ -519,13 +519,18 @@ class IfExpression : public Expression {
return InheritsFromIfExpression(node->kind());
}
auto condition() const -> Nonnull<Expression*> { return condition_; }
auto then_expression() const -> Nonnull<Expression*> {
return then_expression_;
auto condition() const -> const Expression& { return *condition_; }
auto condition() -> Expression& { return *condition_; }
auto then_expression() const -> const Expression& {
return *then_expression_;
}
auto else_expression() const -> Nonnull<Expression*> {
return else_expression_;
auto then_expression() -> Expression& { return *then_expression_; }
auto else_expression() const -> const Expression& {
return *else_expression_;
}
auto else_expression() -> Expression& { return *else_expression_; }
private:
Nonnull<Expression*> condition_;