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

- 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
+9 -10
View File
@@ -4,8 +4,7 @@
#include "executable_semantics/syntax/syntax_helpers.h"
#include <iostream>
#include "common/ostream.h"
#include "executable_semantics/interpreter/interpreter.h"
#include "executable_semantics/interpreter/typecheck.h"
#include "executable_semantics/tracing_flag.h"
@@ -14,11 +13,11 @@ namespace Carbon {
void ExecProgram(std::list<Declaration>* fs) {
if (tracing_output) {
std::cout << "********** source program **********" << std::endl;
llvm::outs() << "********** source program **********\n";
for (const auto& decl : *fs) {
decl.Print();
llvm::outs() << decl;
}
std::cout << "********** type checking **********" << std::endl;
llvm::outs() << "********** type checking **********\n";
}
state = new State(); // Compile-time state.
TypeCheckContext p = TopLevel(fs);
@@ -29,15 +28,15 @@ void ExecProgram(std::list<Declaration>* fs) {
new_decls.push_back(MakeTypeChecked(decl, top, ct_top));
}
if (tracing_output) {
std::cout << std::endl;
std::cout << "********** type checking complete **********" << std::endl;
llvm::outs() << "\n";
llvm::outs() << "********** type checking complete **********\n";
for (const auto& decl : new_decls) {
decl.Print();
llvm::outs() << decl;
}
std::cout << "********** starting execution **********" << std::endl;
llvm::outs() << "********** starting execution **********\n";
}
int result = InterpProgram(&new_decls);
std::cout << "result: " << result << std::endl;
llvm::outs() << "result: " << result << "\n";
}
} // namespace Carbon