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

Tuple restrictions (#486)

Browse Source 
* implement tuple restrictions: (1) named fields after positional, (2) order matters

* after_named_member => seen_named_member
This commit is contained in:
Jeremy G. Siek
2021-04-22 17:51:43 -04:00
committed by GitHub
parent 8b78a85276
commit 5946d9c033
17 changed files with 98 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executable_semantics/interpreter/value.cpp
+8 -5
View File
@@ -339,13 +339,12 @@ auto TypeEqual(const Value* t1, const Value* t2) -> bool {
return false;
}
for (size_t i = 0; i < t1->u.tuple.elts->size(); ++i) {
std::optional<Address> t2_field =
FindTupleField((*t1->u.tuple.elts)[i].first, t2);
if (t2_field == std::nullopt) {
if ((*t1->u.tuple.elts)[i].first != (*t2->u.tuple.elts)[i].first) {
return false;
}
if (!TypeEqual(state->ReadFromMemory((*t1->u.tuple.elts)[i].second, 0),
state->ReadFromMemory(*t2_field, 0))) {
if (!TypeEqual(
state->ReadFromMemory((*t1->u.tuple.elts)[i].second, 0),
state->ReadFromMemory((*t2->u.tuple.elts)[i].second, 0))) {
return false;
}
}
@@ -354,9 +353,13 @@ auto TypeEqual(const Value* t1, const Value* t2) -> bool {
case ValKind::IntTV:
case ValKind::BoolTV:
case ValKind::ContinuationTV:
case ValKind::TypeTV:
return true;
default:
std::cerr << "TypeEqual used to compare non-type values" << std::endl;
PrintValue(t1, std::cerr);
std::cerr << std::endl;
PrintValue(t2, std::cerr);
exit(-1);
}
}