carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-09-29 16:24:58 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Unify tuple types with tuples-of-types in the interpreter (#442)

Browse Source
This commit is contained in:
Geoff Romer
2021-04-12 16:13:00 -07:00
committed by GitHub
parent 22656c8e09
commit cf7c97bf28
7 changed files with 82 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executable_semantics/interpreter/interpreter.cpp
+8 -29
View File
@@ -27,18 +27,6 @@ auto PatternMatch(const Value* pat, const Value* val, Env,
std::list<std::string>*, int) -> std::optional<Env>;
void HandleValue();
template <class T>
static auto FindField(const std::string& field,
const std::vector<std::pair<std::string, T>>& inits)
-> std::optional<T> {
for (const auto& i : inits) {
if (i.first == field) {
return i.second;
}
}
return std::nullopt;
}
//
// Auxiliary Functions
//
@@ -105,14 +93,6 @@ auto CopyVal(const Value* val, int line_num) -> const Value* {
return MakeAutoTypeVal();
case ValKind::ContinuationTV:
return MakeContinuationTypeVal();
case ValKind::TupleTV: {
auto new_fields = new VarValues();
for (auto& field : *val->u.tuple_type.fields) {
auto v = CopyVal(field.second, line_num);
new_fields->push_back(make_pair(field.first, v));
}
return MakeTupleTypeVal(new_fields);
}
case ValKind::StructTV:
case ValKind::ChoiceTV:
case ValKind::VarPatV:
@@ -300,7 +280,7 @@ void InitGlobals(std::list<Declaration>* fs) {
auto ChoiceDeclaration::InitGlobals(Env& globals) const -> void {
auto alts = new VarValues();
for (auto kv : alternatives) {
auto t = ToType(this->line_num, InterpExp(Env(), kv.second));
auto t = InterpExp(Env(), kv.second);
alts->push_back(make_pair(kv.first, t));
}
auto ct = MakeChoiceTypeVal(name, alts);
@@ -315,8 +295,7 @@ auto StructDeclaration::InitGlobals(Env& globals) const -> void {
++i) {
switch ((*i)->tag) {
case MemberKind::FieldMember: {
auto t =
ToType(definition.line_num, InterpExp(Env(), (*i)->u.field.type));
auto t = InterpExp(Env(), (*i)->u.field.type);
fields->push_back(make_pair(*(*i)->u.field.name, t));
break;
}
@@ -446,7 +425,7 @@ auto PatternMatch(const Value* p, const Value* v, Env values,
exit(-1);
}
for (auto& elt : *p->u.tuple.elts) {
auto a = FindField(elt.first, *v->u.tuple.elts);
auto a = FindTupleField(elt.first, v);
if (a == std::nullopt) {
std::cerr << "runtime error: field " << elt.first << "not in ";
PrintValue(v, std::cerr);
@@ -530,7 +509,7 @@ void PatternAssignment(const Value* pat, const Value* val, int line_num) {
exit(-1);
}
for (auto& elt : *pat->u.tuple.elts) {
auto a = FindField(elt.first, *val->u.tuple.elts);
auto a = FindTupleField(elt.first, val);
if (a == std::nullopt) {
std::cerr << "runtime error: field " << elt.first << "not in ";
PrintValue(val, std::cerr);
@@ -954,7 +933,7 @@ auto GetMember(Address a, const std::string& f) -> Address {
const Value* v = state->heap[a];
switch (v->tag) {
case ValKind::StructV: {
auto a = FindField(f, *v->u.struct_val.inits->u.tuple.elts);
auto a = FindTupleField(f, v->u.struct_val.inits);
if (a == std::nullopt) {
std::cerr << "runtime error, member " << f << " not in ";
PrintValue(v, std::cerr);
@@ -964,7 +943,7 @@ auto GetMember(Address a, const std::string& f) -> Address {
return *a;
}
case ValKind::TupleV: {
auto a = FindField(f, *v->u.tuple.elts);
auto a = FindTupleField(f, v);
if (a == std::nullopt) {
std::cerr << "field " << f << " not in ";
PrintValue(v, std::cerr);
@@ -1069,7 +1048,7 @@ void HandleValue() {
// -> { { &v[i] :: C, E, F} :: S, H }
const Value* tuple = act->results[0];
std::string f = std::to_string(ToInteger(act->results[1]));
auto a = FindField(f, *tuple->u.tuple.elts);
auto a = FindTupleField(f, tuple);
if (a == std::nullopt) {
std::cerr << "runtime error: field " << f << "not in ";
PrintValue(tuple, std::cerr);
@@ -1139,7 +1118,7 @@ void HandleValue() {
// { { v :: [][i] :: C, E, F} :: S, H}
// -> { { v_i :: C, E, F} : S, H}
std::string f = std::to_string(ToInteger(act->results[1]));
auto a = FindField(f, *tuple->u.tuple.elts);
auto a = FindTupleField(f, tuple);
if (a == std::nullopt) {
std::cerr << "runtime error, field " << f << " not in ";
PrintValue(tuple, std::cerr);