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

Migrate remaining Expression alternatives to IndirectValue (#607)

Browse Source
This commit is contained in:
Geoff Romer
2021-06-28 17:03:14 -07:00
committed by GitHub
parent 1057eda8f7
commit 19e4bc55ce
5 changed files with 81 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executable_semantics/ast/expression.cpp
+21 -20
View File
@@ -84,11 +84,12 @@ auto Expression::MakeContinuationType(int line_num) -> const Expression* {
return type;
}
auto Expression::MakeFunType(int line_num, const Expression* param,
const Expression* ret) -> const Expression* {
auto Expression::MakeFunType(int line_num, Expression param, Expression ret)
-> const Expression* {
auto* t = new Expression();
t->line_num = line_num;
t->value = FunctionType({.parameter = param, .return_type = ret});
t->value = FunctionType(
{.parameter = std::move(param), .return_type = std::move(ret)});
return t;
}
@@ -99,11 +100,11 @@ auto Expression::MakeVar(int line_num, std::string var) -> const Expression* {
return v;
}
auto Expression::MakeVarPat(int line_num, std::string var,
const Expression* type) -> const Expression* {
auto Expression::MakeVarPat(int line_num, std::string var, Expression type)
-> const Expression* {
auto* v = new Expression();
v->line_num = line_num;
v->value = PatternVariable({.name = std::move(var), .type = type});
v->value = PatternVariable({.name = std::move(var), .type = std::move(type)});
return v;
}
@@ -146,11 +147,11 @@ auto Expression::MakeBinOp(int line_num, enum Operator op, Expression arg1,
return e;
}
auto Expression::MakeCall(int line_num, const Expression* fun,
const Expression* arg) -> const Expression* {
auto Expression::MakeCall(int line_num, Expression fun, Expression arg)
-> const Expression* {
auto* e = new Expression();
e->line_num = line_num;
e->value = Call({.function = fun, .argument = arg});
e->value = Call({.function = std::move(fun), .argument = std::move(arg)});
return e;
}
@@ -186,11 +187,11 @@ auto Expression::MakeTuple(int line_num, std::vector<FieldInitializer> args)
return e;
}
auto Expression::MakeIndex(int line_num, const Expression* exp,
const Expression* i) -> const Expression* {
auto Expression::MakeIndex(int line_num, Expression exp, Expression i)
-> const Expression* {
auto* e = new Expression();
e->line_num = line_num;
e->value = Index({.aggregate = exp, .offset = i});
e->value = Index({.aggregate = std::move(exp), .offset = std::move(i)});
return e;
}
@@ -237,9 +238,9 @@ static void PrintFields(const std::vector<FieldInitializer>& fields) {
void PrintExp(const Expression* e) {
switch (e->tag()) {
case ExpressionKind::Index:
PrintExp(e->GetIndex().aggregate);
PrintExp(e->GetIndex().aggregate.GetPointer());
std::cout << "[";
PrintExp(e->GetIndex().offset);
PrintExp(e->GetIndex().offset.GetPointer());
std::cout << "]";
break;
case ExpressionKind::GetField:
@@ -285,17 +286,17 @@ void PrintExp(const Expression* e) {
std::cout << e->GetVariable().name;
break;
case ExpressionKind::PatternVariable:
PrintExp(e->GetPatternVariable().type);
PrintExp(e->GetPatternVariable().type.GetPointer());
std::cout << ": ";
std::cout << e->GetPatternVariable().name;
break;
case ExpressionKind::Call:
PrintExp(e->GetCall().function);
PrintExp(e->GetCall().function.GetPointer());
if (e->GetCall().argument->tag() == ExpressionKind::Tuple) {
PrintExp(e->GetCall().argument);
PrintExp(e->GetCall().argument.GetPointer());
} else {
std::cout << "(";
PrintExp(e->GetCall().argument);
PrintExp(e->GetCall().argument.GetPointer());
std::cout << ")";
}
break;
@@ -316,9 +317,9 @@ void PrintExp(const Expression* e) {
break;
case ExpressionKind::FunctionT:
std::cout << "fn ";
PrintExp(e->GetFunctionType().parameter);
PrintExp(e->GetFunctionType().parameter.GetPointer());
std::cout << " -> ";
PrintExp(e->GetFunctionType().return_type);
PrintExp(e->GetFunctionType().return_type.GetPointer());
break;
}
}
executable_semantics/ast/expression.h
+14 -14
View File
@@ -70,14 +70,14 @@ struct FieldAccess {
struct Index {
static constexpr ExpressionKind Kind = ExpressionKind::Index;
const Expression* aggregate;
const Expression* offset;
IndirectValue<Expression> aggregate;
IndirectValue<Expression> offset;
};
struct PatternVariable {
static constexpr ExpressionKind Kind = ExpressionKind::PatternVariable;
std::string name;
const Expression* type;
IndirectValue<Expression> type;
};
struct IntLiteral {
@@ -103,14 +103,14 @@ struct PrimitiveOperator {
struct Call {
static constexpr ExpressionKind Kind = ExpressionKind::Call;
const Expression* function;
const Expression* argument;
IndirectValue<Expression> function;
IndirectValue<Expression> argument;
};
struct FunctionType {
static constexpr ExpressionKind Kind = ExpressionKind::FunctionT;
const Expression* parameter;
const Expression* return_type;
IndirectValue<Expression> parameter;
IndirectValue<Expression> return_type;
};
struct AutoT {
@@ -138,7 +138,7 @@ struct Expression {
inline auto tag() const -> ExpressionKind;
static auto MakeVar(int line_num, std::string var) -> const Expression*;
static auto MakeVarPat(int line_num, std::string var, const Expression* type)
static auto MakeVarPat(int line_num, std::string var, Expression type)
-> const Expression*;
static auto MakeInt(int line_num, int i) -> const Expression*;
static auto MakeBool(int line_num, bool b) -> const Expression*;
@@ -148,19 +148,19 @@ struct Expression {
-> const Expression*;
static auto MakeBinOp(int line_num, enum Operator op, Expression arg1,
Expression arg2) -> const Expression*;
static auto MakeCall(int line_num, const Expression* fun,
const Expression* arg) -> const Expression*;
static auto MakeCall(int line_num, Expression fun, Expression arg)
-> const Expression*;
static auto MakeGetField(int line_num, const Expression* exp,
std::string field) -> const Expression*;
static auto MakeTuple(int line_num, std::vector<FieldInitializer> args)
-> const Expression*;
static auto MakeIndex(int line_num, const Expression* exp,
const Expression* i) -> const Expression*;
static auto MakeIndex(int line_num, Expression exp, Expression i)
-> const Expression*;
static auto MakeTypeType(int line_num) -> const Expression*;
static auto MakeIntType(int line_num) -> const Expression*;
static auto MakeBoolType(int line_num) -> const Expression*;
static auto MakeFunType(int line_num, const Expression* param,
const Expression* ret) -> const Expression*;
static auto MakeFunType(int line_num, Expression param, Expression ret)
-> const Expression*;
static auto MakeAutoType(int line_num) -> const Expression*;
static auto MakeContinuationType(int line_num) -> const Expression*;