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

Add underscores to private data members (#898)

Browse Source 
This is the last PR I plan to have focused on #720
This commit is contained in:
Jon Meow
2021-10-19 14:27:10 -07:00
committed by GitHub
parent dc9c36660b
commit ffa4e76ede
17 changed files with 363 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executable_semantics/interpreter/heap.cpp
+14 -14
View File
@@ -14,37 +14,37 @@ auto Heap::AllocateValue(Nonnull<const Value*> v) -> Address {
// ensures that we don't do anything else in between, which is really bad!
// Consider whether to include a copy of the input v in this function
// or to leave it up to the caller.
Address a(values.size());
values.push_back(v);
alive.push_back(true);
Address a(values_.size());
values_.push_back(v);
alive_.push_back(true);
return a;
}
auto Heap::Read(const Address& a, SourceLocation source_loc)
-> Nonnull<const Value*> {
this->CheckAlive(a, source_loc);
return values[a.index]->GetField(arena, a.field_path, source_loc);
return values_[a.index_]->GetField(arena_, a.field_path_, source_loc);
}
void Heap::Write(const Address& a, Nonnull<const Value*> v,
SourceLocation source_loc) {
this->CheckAlive(a, source_loc);
values[a.index] =
values[a.index]->SetField(arena, a.field_path, v, source_loc);
values_[a.index_] =
values_[a.index_]->SetField(arena_, a.field_path_, v, source_loc);
}
void Heap::CheckAlive(const Address& address, SourceLocation source_loc) {
if (!alive[address.index]) {
if (!alive_[address.index_]) {
FATAL_RUNTIME_ERROR(source_loc)
<< "undefined behavior: access to dead value "
<< *values[address.index];
<< *values_[address.index_];
}
}
void Heap::Deallocate(const Address& address) {
CHECK(address.field_path.IsEmpty());
if (alive[address.index]) {
alive[address.index] = false;
CHECK(address.field_path_.IsEmpty());
if (alive_[address.index_]) {
alive_[address.index_] = false;
} else {
FATAL_RUNTIME_ERROR_NO_LINE() << "deallocating an already dead value";
}
@@ -52,17 +52,17 @@ void Heap::Deallocate(const Address& address) {
void Heap::Print(llvm::raw_ostream& out) const {
llvm::ListSeparator sep;
for (size_t i = 0; i < values.size(); ++i) {
for (size_t i = 0; i < values_.size(); ++i) {
out << sep;
PrintAddress(Address(i), out);
}
}
void Heap::PrintAddress(const Address& a, llvm::raw_ostream& out) const {
if (!alive[a.index]) {
if (!alive_[a.index_]) {
out << "!!";
}
out << *values[a.index];
out << *values_[a.index_];
}
} // namespace Carbon