mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-29 22:02:42 +01:00
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:
@@ -4,7 +4,6 @@
|
||||
|
||||
#include "executable_semantics/interpreter/action.h"
|
||||
|
||||
#include <iostream>
|
||||
#include <iterator>
|
||||
#include <map>
|
||||
#include <optional>
|
||||
@@ -57,19 +56,19 @@ auto Action::GetValAction() const -> const ValAction& {
|
||||
return std::get<ValAction>(value);
|
||||
}
|
||||
|
||||
void Action::Print(std::ostream& out) {
|
||||
void Action::Print(llvm::raw_ostream& out) const {
|
||||
switch (tag()) {
|
||||
case ActionKind::LValAction:
|
||||
PrintExp(GetLValAction().exp);
|
||||
out << *GetLValAction().exp;
|
||||
break;
|
||||
case ActionKind::ExpressionAction:
|
||||
PrintExp(GetExpressionAction().exp);
|
||||
out << *GetExpressionAction().exp;
|
||||
break;
|
||||
case ActionKind::StatementAction:
|
||||
PrintStatement(GetStatementAction().stmt, 1);
|
||||
GetStatementAction().stmt->PrintDepth(1, out);
|
||||
break;
|
||||
case ActionKind::ValAction:
|
||||
PrintValue(GetValAction().val, out);
|
||||
out << *GetValAction().val;
|
||||
break;
|
||||
}
|
||||
out << "<" << pos << ">";
|
||||
@@ -77,7 +76,7 @@ void Action::Print(std::ostream& out) {
|
||||
out << "(";
|
||||
for (auto& result : results) {
|
||||
if (result) {
|
||||
PrintValue(result, out);
|
||||
out << *result;
|
||||
}
|
||||
out << ",";
|
||||
}
|
||||
@@ -85,9 +84,9 @@ void Action::Print(std::ostream& out) {
|
||||
}
|
||||
}
|
||||
|
||||
void Action::PrintList(Stack<Action*> ls, std::ostream& out) {
|
||||
void Action::PrintList(Stack<Action*> ls, llvm::raw_ostream& out) {
|
||||
if (!ls.IsEmpty()) {
|
||||
ls.Pop()->Print(out);
|
||||
out << *ls.Pop();
|
||||
if (!ls.IsEmpty()) {
|
||||
out << " :: ";
|
||||
PrintList(ls, out);
|
||||
|
||||
Reference in New Issue
Block a user