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

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/interpreter/interpreter.cpp
+12 -10
View File
@@ -646,7 +646,7 @@ void StepLvalue() {
case ExpressionKind::Index: {
// { {e[i] :: C, E, F} :: S, H}
// -> { e :: [][i] :: C, E, F} :: S, H}
frame->todo.Push(MakeExpAct(exp->GetIndex().aggregate));
frame->todo.Push(MakeExpAct(exp->GetIndex().aggregate.GetPointer()));
act->pos++;
break;
}
@@ -689,14 +689,14 @@ void StepExp() {
}
switch (exp->tag()) {
case ExpressionKind::PatternVariable: {
frame->todo.Push(MakeExpAct(exp->GetPatternVariable().type));
frame->todo.Push(MakeExpAct(exp->GetPatternVariable().type.GetPointer()));
act->pos++;
break;
}
case ExpressionKind::Index: {
// { { e[i] :: C, E, F} :: S, H}
// -> { { e :: [][i] :: C, E, F} :: S, H}
frame->todo.Push(MakeExpAct(exp->GetIndex().aggregate));
frame->todo.Push(MakeExpAct(exp->GetIndex().aggregate.GetPointer()));
act->pos++;
break;
}
@@ -764,7 +764,7 @@ void StepExp() {
case ExpressionKind::Call:
// { {e1(e2) :: C, E, F} :: S, H}
// -> { {e1 :: [](e2) :: C, E, F} :: S, H}
frame->todo.Push(MakeExpAct(exp->GetCall().function));
frame->todo.Push(MakeExpAct(exp->GetCall().function.GetPointer()));
act->pos++;
break;
case ExpressionKind::IntT: {
@@ -792,7 +792,8 @@ void StepExp() {
break;
}
case ExpressionKind::FunctionT: {
frame->todo.Push(MakeExpAct(exp->GetFunctionType().parameter));
frame->todo.Push(
MakeExpAct(exp->GetFunctionType().parameter.GetPointer()));
act->pos++;
break;
}
@@ -1093,7 +1094,7 @@ void HandleValue() {
case ExpressionKind::Index: {
if (act->pos == 1) {
frame->todo.Pop(1);
frame->todo.Push(MakeExpAct(exp->GetIndex().offset));
frame->todo.Push(MakeExpAct(exp->GetIndex().offset.GetPointer()));
} else if (act->pos == 2) {
// { v :: [][i] :: C, E, F} :: S, H}
// -> { { &v[i] :: C, E, F} :: S, H }
@@ -1163,7 +1164,7 @@ void HandleValue() {
case ExpressionKind::Index: {
if (act->pos == 1) {
frame->todo.Pop(1);
frame->todo.Push(MakeExpAct(exp->GetIndex().offset));
frame->todo.Push(MakeExpAct(exp->GetIndex().offset.GetPointer()));
} else if (act->pos == 2) {
auto tuple = act->results[0];
switch (tuple->tag) {
@@ -1227,7 +1228,7 @@ void HandleValue() {
// { { v :: [](e) :: C, E, F} :: S, H}
// -> { { e :: v([]) :: C, E, F} :: S, H}
frame->todo.Pop(1);
frame->todo.Push(MakeExpAct(exp->GetCall().argument));
frame->todo.Push(MakeExpAct(exp->GetCall().argument.GetPointer()));
} else if (act->pos == 2) {
// { { v2 :: v1([]) :: C, E, F} :: S, H}
// -> { {C',E',F'} :: {C, E, F} :: S, H}
@@ -1252,7 +1253,8 @@ void HandleValue() {
// { { pt :: fn [] -> e :: C, E, F} :: S, H}
// -> { { e :: fn pt -> []) :: C, E, F} :: S, H}
frame->todo.Pop(1);
frame->todo.Push(MakeExpAct(exp->GetFunctionType().return_type));
frame->todo.Push(
MakeExpAct(exp->GetFunctionType().return_type.GetPointer()));
}
break;
}
@@ -1500,7 +1502,7 @@ auto InterpProgram(std::list<Declaration>* fs) -> int {
const Expression* arg = Expression::MakeTuple(0, {});
const Expression* call_main =
Expression::MakeCall(0, Expression::MakeVar(0, "main"), arg);
Expression::MakeCall(0, *Expression::MakeVar(0, "main"), *arg);
auto todo = Stack(MakeExpAct(call_main));
auto* scope = new Scope(globals, std::list<std::string>());
auto* frame = new Frame("top", Stack(scope), todo);
executable_semantics/interpreter/typecheck.cpp
+29 -24
View File
@@ -67,8 +67,8 @@ auto ReifyType(const Value* t, int line_num) -> const Expression* {
return Expression::MakeContinuationType(0);
case ValKind::FunctionTV:
return Expression::MakeFunType(
0, ReifyType(t->GetFunctionType().param, line_num),
ReifyType(t->GetFunctionType().ret, line_num));
0, *ReifyType(t->GetFunctionType().param, line_num),
*ReifyType(t->GetFunctionType().ret, line_num));
case ValKind::TupleV: {
std::vector<FieldInitializer> args;
for (const TupleElement& field : *t->GetTuple().elements) {
@@ -144,7 +144,7 @@ auto TypeCheckExp(const Expression* e, TypeEnv types, Env values,
<< std::endl;
exit(-1);
}
auto t = InterpExp(values, e->GetPatternVariable().type);
auto t = InterpExp(values, e->GetPatternVariable().type.GetPointer());
if (t->tag == ValKind::AutoTV) {
if (expected == nullptr) {
std::cerr << e->line_num
@@ -157,18 +157,20 @@ auto TypeCheckExp(const Expression* e, TypeEnv types, Env values,
} else if (expected) {
ExpectType(e->line_num, "pattern variable", t, expected);
}
auto new_e = Expression::MakeVarPat(
e->line_num, e->GetPatternVariable().name, ReifyType(t, e->line_num));
auto new_e =
Expression::MakeVarPat(e->line_num, e->GetPatternVariable().name,
*ReifyType(t, e->line_num));
types.Set(e->GetPatternVariable().name, t);
return TCResult(new_e, t, types);
}
case ExpressionKind::Index: {
auto res = TypeCheckExp(e->GetIndex().aggregate, types, values, nullptr,
TCContext::ValueContext);
auto res = TypeCheckExp(e->GetIndex().aggregate.GetPointer(), types,
values, nullptr, TCContext::ValueContext);
auto t = res.type;
switch (t->tag) {
case ValKind::TupleV: {
auto i = ToInteger(InterpExp(values, e->GetIndex().offset));
auto i =
ToInteger(InterpExp(values, e->GetIndex().offset.GetPointer()));
std::string f = std::to_string(i);
std::optional<Address> field_address = FindTupleField(f, t);
if (field_address == std::nullopt) {
@@ -180,7 +182,7 @@ auto TypeCheckExp(const Expression* e, TypeEnv types, Env values,
}
auto field_t = state->heap.Read(*field_address, e->line_num);
auto new_e = Expression::MakeIndex(
e->line_num, res.exp, Expression::MakeInt(e->line_num, i));
e->line_num, *res.exp, *Expression::MakeInt(e->line_num, i));
return TCResult(new_e, field_t, res.types);
}
default:
@@ -372,18 +374,18 @@ auto TypeCheckExp(const Expression* e, TypeEnv types, Env values,
break;
}
case ExpressionKind::Call: {
auto fun_res = TypeCheckExp(e->GetCall().function, types, values, nullptr,
TCContext::ValueContext);
auto fun_res = TypeCheckExp(e->GetCall().function.GetPointer(), types,
values, nullptr, TCContext::ValueContext);
switch (fun_res.type->tag) {
case ValKind::FunctionTV: {
auto fun_t = fun_res.type;
auto arg_res =
TypeCheckExp(e->GetCall().argument, fun_res.types, values,
fun_t->GetFunctionType().param, context);
TypeCheckExp(e->GetCall().argument.GetPointer(), fun_res.types,
values, fun_t->GetFunctionType().param, context);
ExpectType(e->line_num, "call", fun_t->GetFunctionType().param,
arg_res.type);
auto new_e =
Expression::MakeCall(e->line_num, fun_res.exp, arg_res.exp);
Expression::MakeCall(e->line_num, *fun_res.exp, *arg_res.exp);
return TCResult(new_e, fun_t->GetFunctionType().ret, arg_res.types);
}
default: {
@@ -401,22 +403,25 @@ auto TypeCheckExp(const Expression* e, TypeEnv types, Env values,
switch (context) {
case TCContext::ValueContext:
case TCContext::TypeContext: {
auto pt = InterpExp(values, e->GetFunctionType().parameter);
auto rt = InterpExp(values, e->GetFunctionType().return_type);
auto pt =
InterpExp(values, e->GetFunctionType().parameter.GetPointer());
auto rt =
InterpExp(values, e->GetFunctionType().return_type.GetPointer());
auto new_e =
Expression::MakeFunType(e->line_num, ReifyType(pt, e->line_num),
ReifyType(rt, e->line_num));
Expression::MakeFunType(e->line_num, *ReifyType(pt, e->line_num),
*ReifyType(rt, e->line_num));
return TCResult(new_e, Value::MakeTypeTypeVal(), types);
}
case TCContext::PatternContext: {
auto param_res = TypeCheckExp(e->GetFunctionType().parameter, types,
values, nullptr, context);
auto ret_res =
TypeCheckExp(e->GetFunctionType().return_type, param_res.types,
auto param_res =
TypeCheckExp(e->GetFunctionType().parameter.GetPointer(), types,
values, nullptr, context);
auto ret_res =
TypeCheckExp(e->GetFunctionType().return_type.GetPointer(),
param_res.types, values, nullptr, context);
auto new_e = Expression::MakeFunType(
e->line_num, ReifyType(param_res.type, e->line_num),
ReifyType(ret_res.type, e->line_num));
e->line_num, *ReifyType(param_res.type, e->line_num),
*ReifyType(ret_res.type, e->line_num));
return TCResult(new_e, Value::MakeTypeTypeVal(), ret_res.types);
}
}