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

Migrate PrimitiveOperator to value semantics (#606)

Browse Source 
* Make PrimitiveOperator.arguments a value.
* Make operator factory functions take Expressions by value.
This commit is contained in:
Geoff Romer
2021-06-28 15:58:32 -07:00
committed by GitHub
parent 276880ae83
commit 056da4dd5c
5 changed files with 42 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executable_semantics/interpreter/interpreter.cpp
+4 -4
View File
@@ -746,11 +746,11 @@ void StepExp() {
frame->todo.Push(MakeValAct(Value::MakeBoolVal(exp->GetBoolean())));
break;
case ExpressionKind::PrimitiveOp:
if (exp->GetPrimitiveOperator().arguments->size() > 0) {
if (exp->GetPrimitiveOperator().arguments.size() > 0) {
// { {op(e :: es) :: C, E, F} :: S, H}
// -> { e :: op([] :: es) :: C, E, F} :: S, H}
frame->todo.Push(
MakeExpAct(exp->GetPrimitiveOperator().arguments->front()));
MakeExpAct(&exp->GetPrimitiveOperator().arguments.front()));
act->pos++;
} else {
// { {v :: op(]) :: C, E, F} :: S, H}
@@ -1205,11 +1205,11 @@ void HandleValue() {
}
case ExpressionKind::PrimitiveOp: {
if (act->pos !=
static_cast<int>(exp->GetPrimitiveOperator().arguments->size())) {
static_cast<int>(exp->GetPrimitiveOperator().arguments.size())) {
// { {v :: op(vs,[],e,es) :: C, E, F} :: S, H}
// -> { {e :: op(vs,v,[],es) :: C, E, F} :: S, H}
const Expression* arg =
(*exp->GetPrimitiveOperator().arguments)[act->pos];
&exp->GetPrimitiveOperator().arguments[act->pos];
frame->todo.Pop(1);
frame->todo.Push(MakeExpAct(arg));
} else {
executable_semantics/interpreter/typecheck.cpp
+5 -5
View File
@@ -85,7 +85,7 @@ auto ReifyType(const Value* t, int line_num) -> const Expression* {
return Expression::MakeVar(0, *t->GetChoiceType().name);
case ValKind::PointerTV:
return Expression::MakeUnOp(
0, Operator::Ptr, ReifyType(t->GetPointerType().type, line_num));
0, Operator::Ptr, *ReifyType(t->GetPointerType().type, line_num));
default:
std::cerr << line_num << ": expected a type, not ";
PrintValue(t, std::cerr);
@@ -314,14 +314,14 @@ auto TypeCheckExp(const Expression* e, TypeEnv types, Env values,
case ExpressionKind::Boolean:
return TCResult(e, Value::MakeBoolTypeVal(), types);
case ExpressionKind::PrimitiveOp: {
auto es = new std::vector<const Expression*>();
std::vector<Expression> es;
std::vector<const Value*> ts;
auto new_types = types;
for (auto& argument : *e->GetPrimitiveOperator().arguments) {
auto res = TypeCheckExp(argument, types, values, nullptr,
for (const Expression& argument : e->GetPrimitiveOperator().arguments) {
auto res = TypeCheckExp(&argument, types, values, nullptr,
TCContext::ValueContext);
new_types = res.types;
es->push_back(res.exp);
es.push_back(*res.exp);
ts.push_back(res.type);
}
auto new_e =