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

Refactor output to be more streaming-focused. (#666)

Browse Source 
- Switch code to llvm::raw_ostream as part of standardizing output forms.
    - Preferring llvm::raw_ostream over std::ostream because other tooling code should be expected to rely on llvm more closely, and an overall preference towards library consistency.
    - There are a couple spots in syntax/ that still use std streams, but I'd prefer to take a separate PR to see how best to address those.
    - std::boolalpha doesn't work with llvm, so I've implemented equivalent in a couple places (not enough that it felt like worth making a helper function).
- Implement Print(ostream) as consistently as we can, as an instance member.
    - This facilitates the use of the common/ostream.h template to provide operators.
    - Preferring this approach so that Print is easily accessible via gdb, per suggestion on #executable-semantics.
- Switch code currently calling `type->Print(ostream)` to instead do `ostream << *type`.
- Remove the unused `PrintTypeEnv`, nothing used it and the declaration didn't match the definition.
This commit is contained in:
Jon Meow
2021-07-20 13:16:48 -07:00
committed by GitHub
parent 368fc0063c
commit 8fccecadeb
31 changed files with 391 additions and 458 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executable_semantics/interpreter/heap.cpp
+7 -9
View File
@@ -23,7 +23,7 @@ auto Heap::Read(const Address& a, int line_num) -> const Value* {
return values_[a.index]->GetField(a.field_path, line_num);
}
auto Heap::Write(const Address& a, const Value* v, int line_num) -> void {
void Heap::Write(const Address& a, const Value* v, int line_num) {
CHECK(v != nullptr);
this->CheckAlive(a, line_num);
values_[a.index] = values_[a.index]->SetField(a.field_path, v, line_num);
@@ -31,9 +31,8 @@ auto Heap::Write(const Address& a, const Value* v, int line_num) -> void {
void Heap::CheckAlive(const Address& address, int line_num) {
if (!alive_[address.index]) {
std::cerr << line_num << ": undefined behavior: access to dead value ";
PrintValue(values_[address.index], std::cerr);
std::cerr << std::endl;
llvm::errs() << line_num << ": undefined behavior: access to dead value "
<< *values_[address.index] << "\n";
exit(-1);
}
}
@@ -43,24 +42,23 @@ void Heap::Deallocate(const Address& address) {
if (alive_[address.index]) {
alive_[address.index] = false;
} else {
std::cerr << "runtime error, deallocating an already dead value"
<< std::endl;
llvm::errs() << "runtime error, deallocating an already dead value\n";
exit(-1);
}
}
void Heap::PrintHeap(std::ostream& out) {
void Heap::Print(llvm::raw_ostream& out) const {
for (size_t i = 0; i < values_.size(); ++i) {
PrintAddress(Address(i), out);
out << ", ";
}
}
auto Heap::PrintAddress(const Address& a, std::ostream& out) -> void {
void Heap::PrintAddress(const Address& a, llvm::raw_ostream& out) const {
if (!alive_[a.index]) {
out << "!!";
}
PrintValue(values_[a.index], out);
out << *values_[a.index];
}
} // namespace Carbon