Skip to content
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

Switch Expression to use inheritance+cast #712

Merged
merged 8 commits into from
Aug 6, 2021
Merged

Switch Expression to use inheritance+cast #712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5751a5e
Switch Expression to use inheritance+cast
jonmeow Aug 5, 2021
3596403
Merge
jonmeow Aug 6, 2021
9752eea
Merge branch 'trunk' into expr-inherit
jonmeow Aug 6, 2021
39510e0
Update executable_semantics/interpreter/interpreter.cpp
jonmeow Aug 6, 2021
83f2549
Switch to global_arena for consistency
jonmeow Aug 6, 2021
a745553
Merge branch 'expr-inherit' of https://github.com/jonmeow/carbon-lang…
jonmeow Aug 6, 2021
9a0b960
Merge
jonmeow Aug 6, 2021
5b0652b
Merge branch 'trunk' into expr-inherit
jonmeow Aug 6, 2021
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
239 changes: 48 additions & 191 deletions executable_semantics/ast/expression.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,13 @@
#include "executable_semantics/common/arena.h"
#include "executable_semantics/common/error.h"
#include "llvm/ADT/StringExtras.h"
#include "llvm/Support/Casting.h"
#include "llvm/Support/raw_ostream.h"

namespace Carbon {

using llvm::cast;

auto ExpressionFromParenContents(
int line_num, const ParenContents<Expression>& paren_contents)
-> const Expression* {
Expand All @@ -27,161 +30,10 @@ auto ExpressionFromParenContents(
auto TupleExpressionFromParenContents(
int line_num, const ParenContents<Expression>& paren_contents)
-> const Expression* {
return Expression::MakeTupleLiteral(
return global_arena->New<TupleLiteral>(
line_num, paren_contents.TupleElements<FieldInitializer>(line_num));
}

auto Expression::GetIdentifierExpression() const
-> const IdentifierExpression& {
return std::get<IdentifierExpression>(value);
}

auto Expression::GetFieldAccessExpression() const
-> const FieldAccessExpression& {
return std::get<FieldAccessExpression>(value);
}

auto Expression::GetIndexExpression() const -> const IndexExpression& {
return std::get<IndexExpression>(value);
}

auto Expression::GetIntLiteral() const -> int {
return std::get<IntLiteral>(value).value;
}

auto Expression::GetBoolLiteral() const -> bool {
return std::get<BoolLiteral>(value).value;
}

auto Expression::GetTupleLiteral() const -> const TupleLiteral& {
return std::get<TupleLiteral>(value);
}

auto Expression::GetPrimitiveOperatorExpression() const
-> const PrimitiveOperatorExpression& {
return std::get<PrimitiveOperatorExpression>(value);
}

auto Expression::GetCallExpression() const -> const CallExpression& {
return std::get<CallExpression>(value);
}

auto Expression::GetFunctionTypeLiteral() const -> const FunctionTypeLiteral& {
return std::get<FunctionTypeLiteral>(value);
}

auto Expression::MakeTypeTypeLiteral(int line_num) -> const Expression* {
auto* t = global_arena->New<Expression>();
t->line_num = line_num;
t->value = TypeTypeLiteral();
return t;
}

auto Expression::MakeIntTypeLiteral(int line_num) -> const Expression* {
auto* t = global_arena->New<Expression>();
t->line_num = line_num;
t->value = IntTypeLiteral();
return t;
}

auto Expression::MakeBoolTypeLiteral(int line_num) -> const Expression* {
auto* t = global_arena->New<Expression>();
t->line_num = line_num;
t->value = BoolTypeLiteral();
return t;
}

// Returns a Continuation type AST node at the given source location.
auto Expression::MakeContinuationTypeLiteral(int line_num)
-> const Expression* {
auto* type = global_arena->New<Expression>();
type->line_num = line_num;
type->value = ContinuationTypeLiteral();
return type;
}

auto Expression::MakeFunctionTypeLiteral(int line_num,
const Expression* parameter,
const Expression* return_type,
bool is_omitted_return_type)
-> const Expression* {
auto* t = global_arena->New<Expression>();
t->line_num = line_num;
t->value =
FunctionTypeLiteral({.parameter = parameter,
.return_type = return_type,
.is_omitted_return_type = is_omitted_return_type});
return t;
}

auto Expression::MakeIdentifierExpression(int line_num, std::string var)
-> const Expression* {
auto* v = global_arena->New<Expression>();
v->line_num = line_num;
v->value = IdentifierExpression({.name = std::move(var)});
return v;
}

auto Expression::MakeIntLiteral(int line_num, int i) -> const Expression* {
auto* e = global_arena->New<Expression>();
e->line_num = line_num;
e->value = IntLiteral({.value = i});
return e;
}

auto Expression::MakeBoolLiteral(int line_num, bool b) -> const Expression* {
auto* e = global_arena->New<Expression>();
e->line_num = line_num;
e->value = BoolLiteral({.value = b});
return e;
}

auto Expression::MakePrimitiveOperatorExpression(
int line_num, enum Operator op, std::vector<const Expression*> args)
-> const Expression* {
auto* e = global_arena->New<Expression>();
e->line_num = line_num;
e->value =
PrimitiveOperatorExpression({.op = op, .arguments = std::move(args)});
return e;
}

auto Expression::MakeCallExpression(int line_num, const Expression* fun,
const Expression* arg)
-> const Expression* {
auto* e = global_arena->New<Expression>();
e->line_num = line_num;
e->value = CallExpression({.function = fun, .argument = arg});
return e;
}

auto Expression::MakeFieldAccessExpression(int line_num, const Expression* exp,
std::string field)
-> const Expression* {
auto* e = global_arena->New<Expression>();
e->line_num = line_num;
e->value =
FieldAccessExpression({.aggregate = exp, .field = std::move(field)});
return e;
}

auto Expression::MakeTupleLiteral(int line_num,
std::vector<FieldInitializer> args)
-> const Expression* {
auto* e = global_arena->New<Expression>();
e->line_num = line_num;
e->value = TupleLiteral({.fields = std::move(args)});
return e;
}

auto Expression::MakeIndexExpression(int line_num, const Expression* exp,
const Expression* i) -> const Expression* {
auto* e = global_arena->New<Expression>();
e->line_num = line_num;
e->value = IndexExpression({.aggregate = exp, .offset = i});
return e;
}

static void PrintOp(llvm::raw_ostream& out, Operator op) {
switch (op) {
case Operator::Add:
Expand Down Expand Up @@ -220,69 +72,74 @@ static void PrintFields(llvm::raw_ostream& out,
}

void Expression::Print(llvm::raw_ostream& out) const {
switch (tag()) {
case ExpressionKind::IndexExpression:
out << *GetIndexExpression().aggregate << "["
<< *GetIndexExpression().offset << "]";
switch (Tag()) {
case Expression::Kind::IndexExpression: {
const auto& index = cast<IndexExpression>(*this);
out << *index.Aggregate() << "[" << *index.Offset() << "]";
break;
case ExpressionKind::FieldAccessExpression:
out << *GetFieldAccessExpression().aggregate << "."
<< GetFieldAccessExpression().field;
}
case Expression::Kind::FieldAccessExpression: {
const auto& access = cast<FieldAccessExpression>(*this);
out << *access.Aggregate() << "." << access.Field();
break;
case ExpressionKind::TupleLiteral:
}
case Expression::Kind::TupleLiteral:
out << "(";
PrintFields(out, GetTupleLiteral().fields);
PrintFields(out, cast<TupleLiteral>(*this).Fields());
out << ")";
break;
case ExpressionKind::IntLiteral:
out << GetIntLiteral();
case Expression::Kind::IntLiteral:
out << cast<IntLiteral>(*this).Val();
break;
case ExpressionKind::BoolLiteral:
out << (GetBoolLiteral() ? "true" : "false");
case Expression::Kind::BoolLiteral:
out << (cast<BoolLiteral>(*this).Val() ? "true" : "false");
break;
case ExpressionKind::PrimitiveOperatorExpression: {
case Expression::Kind::PrimitiveOperatorExpression: {
out << "(";
PrimitiveOperatorExpression op = GetPrimitiveOperatorExpression();
if (op.arguments.size() == 0) {
PrintOp(out, op.op);
} else if (op.arguments.size() == 1) {
PrintOp(out, op.op);
out << " " << *op.arguments[0];
} else if (op.arguments.size() == 2) {
out << *op.arguments[0] << " ";
PrintOp(out, op.op);
out << " " << *op.arguments[1];
PrimitiveOperatorExpression op = cast<PrimitiveOperatorExpression>(*this);
if (op.Arguments().size() == 0) {
PrintOp(out, op.Op());
} else if (op.Arguments().size() == 1) {
PrintOp(out, op.Op());
out << " " << *op.Arguments()[0];
} else if (op.Arguments().size() == 2) {
out << *op.Arguments()[0] << " ";
PrintOp(out, op.Op());
out << " " << *op.Arguments()[1];
}
out << ")";
break;
}
case ExpressionKind::IdentifierExpression:
out << GetIdentifierExpression().name;
break;
case ExpressionKind::CallExpression:
out << *GetCallExpression().function;
if (GetCallExpression().argument->tag() == ExpressionKind::TupleLiteral) {
out << *GetCallExpression().argument;
case Expression::Kind::IdentifierExpression:
out << cast<IdentifierExpression>(*this).Name();
break;
case Expression::Kind::CallExpression: {
const auto& call = cast<CallExpression>(*this);
out << *call.Function();
if (call.Argument()->Tag() == Expression::Kind::TupleLiteral) {
out << *call.Argument();
} else {
out << "(" << *GetCallExpression().argument << ")";
out << "(" << *call.Argument() << ")";
}
break;
case ExpressionKind::BoolTypeLiteral:
}
case Expression::Kind::BoolTypeLiteral:
out << "Bool";
break;
case ExpressionKind::IntTypeLiteral:
case Expression::Kind::IntTypeLiteral:
out << "i32";
break;
case ExpressionKind::TypeTypeLiteral:
case Expression::Kind::TypeTypeLiteral:
out << "Type";
break;
case ExpressionKind::ContinuationTypeLiteral:
case Expression::Kind::ContinuationTypeLiteral:
out << "Continuation";
break;
case ExpressionKind::FunctionTypeLiteral:
out << "fn " << *GetFunctionTypeLiteral().parameter << " -> "
<< *GetFunctionTypeLiteral().return_type;
case Expression::Kind::FunctionTypeLiteral: {
const auto& fn = cast<FunctionTypeLiteral>(*this);
out << "fn " << *fn.Parameter() << " -> " << *fn.ReturnType();
break;
}
}
}

Expand Down
Loading