mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 22:02:23 +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,8 +4,6 @@
|
||||
|
||||
#include "executable_semantics/ast/declaration.h"
|
||||
|
||||
#include <iostream>
|
||||
|
||||
namespace Carbon {
|
||||
|
||||
auto Declaration::MakeFunctionDeclaration(FunctionDefinition definition)
|
||||
@@ -65,41 +63,36 @@ auto Declaration::GetVariableDeclaration() const -> const VariableDeclaration& {
|
||||
return std::get<VariableDeclaration>(value);
|
||||
}
|
||||
|
||||
void Declaration::Print() const {
|
||||
void Declaration::Print(llvm::raw_ostream& out) const {
|
||||
switch (tag()) {
|
||||
case DeclarationKind::FunctionDeclaration:
|
||||
GetFunctionDeclaration().definition.Print();
|
||||
out << GetFunctionDeclaration().definition;
|
||||
break;
|
||||
|
||||
case DeclarationKind::StructDeclaration: {
|
||||
const StructDefinition& struct_def = GetStructDeclaration().definition;
|
||||
std::cout << "struct " << struct_def.name << " {" << std::endl;
|
||||
out << "struct " << struct_def.name << " {\n";
|
||||
for (Member* m : struct_def.members) {
|
||||
m->Print();
|
||||
out << *m;
|
||||
}
|
||||
std::cout << "}" << std::endl;
|
||||
out << "}\n";
|
||||
break;
|
||||
}
|
||||
|
||||
case DeclarationKind::ChoiceDeclaration: {
|
||||
const auto& choice = GetChoiceDeclaration();
|
||||
std::cout << "choice " << choice.name << " {" << std::endl;
|
||||
out << "choice " << choice.name << " {\n";
|
||||
for (const auto& [name, signature] : choice.alternatives) {
|
||||
std::cout << "alt " << name << " ";
|
||||
PrintExp(signature);
|
||||
std::cout << ";" << std::endl;
|
||||
out << "alt " << name << " " << *signature << ";\n";
|
||||
}
|
||||
std::cout << "}" << std::endl;
|
||||
out << "}\n";
|
||||
break;
|
||||
}
|
||||
|
||||
case DeclarationKind::VariableDeclaration: {
|
||||
const auto& var = GetVariableDeclaration();
|
||||
std::cout << "var ";
|
||||
PrintExp(var.type);
|
||||
std::cout << " : " << var.name << " = ";
|
||||
PrintExp(var.initializer);
|
||||
std::cout << std::endl;
|
||||
out << "var " << *var.type << " : " << var.name << " = "
|
||||
<< *var.initializer << "\n";
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user