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

Style updates, mostly _ naming (#970)

Browse Source 
There are some declaration order changes, and a few test classes switched from `struct` to `class`. However, this PR is mostly adopting `_` naming of private member variables due to the shift in naming style. None of what's here should have behavior impacts, it should just be style.

Note, there are a lot of things that *look* like they could be accessor-named, but I'm not doing that in this change. Happy to do it separately if you want me to do another PR focused on it.

Co-authored-by: Chandler Carruth <chandlerc@gmail.com>
This commit is contained in:
Jon Meow
2021-12-07 09:46:44 -08:00
committed by GitHub
co-authored by Chandler Carruth
parent be8d0a993b
commit 652cd8c636
29 changed files with 491 additions and 481 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/driver/driver.cpp
+22 -22
View File
@@ -37,7 +37,7 @@ auto GetSubcommand(llvm::StringRef name) -> Subcommand {
auto Driver::RunFullCommand(llvm::ArrayRef<llvm::StringRef> args) -> bool {
if (args.empty()) {
error_stream << "ERROR: No subcommand specified.\n";
error_stream_ << "ERROR: No subcommand specified.\n";
return false;
}
@@ -46,8 +46,8 @@ auto Driver::RunFullCommand(llvm::ArrayRef<llvm::StringRef> args) -> bool {
std::next(args.begin()), args.end());
switch (GetSubcommand(subcommand_text)) {
case Subcommand::Unknown:
error_stream << "ERROR: Unknown subcommand '" << subcommand_text
<< "'.\n";
error_stream_ << "ERROR: Unknown subcommand '" << subcommand_text
<< "'.\n";
return false;
#define CARBON_SUBCOMMAND(Name, ...) \
@@ -66,7 +66,7 @@ auto Driver::RunHelpSubcommand(llvm::ArrayRef<llvm::StringRef> args) -> bool {
return false;
}
output_stream << "List of subcommands:\n\n";
output_stream_ << "List of subcommands:\n\n";
constexpr llvm::StringLiteral SubcommandsAndHelp[][2] = {
#define CARBON_SUBCOMMAND(Name, Spelling, HelpText) {Spelling, HelpText},
@@ -84,19 +84,19 @@ auto Driver::RunHelpSubcommand(llvm::ArrayRef<llvm::StringRef> args) -> bool {
// FIXME: We should wrap this to the number of columns left after the
// subcommand on the terminal, and using a hanging indent.
llvm::StringRef help_text = subcommand_and_help[1];
output_stream << " "
<< llvm::left_justify(subcommand_text, max_subcommand_width)
<< " - " << help_text << "\n";
output_stream_ << " "
<< llvm::left_justify(subcommand_text, max_subcommand_width)
<< " - " << help_text << "\n";
}
output_stream << "\n";
output_stream_ << "\n";
return true;
}
auto Driver::RunDumpTokensSubcommand(llvm::ArrayRef<llvm::StringRef> args)
-> bool {
if (args.empty()) {
error_stream << "ERROR: No input file specified.\n";
error_stream_ << "ERROR: No input file specified.\n";
return false;
}
@@ -109,24 +109,24 @@ auto Driver::RunDumpTokensSubcommand(llvm::ArrayRef<llvm::StringRef> args)
auto source = SourceBuffer::CreateFromFile(input_file_name);
if (!source) {
error_stream << "ERROR: Unable to open input source file: ";
error_stream_ << "ERROR: Unable to open input source file: ";
llvm::handleAllErrors(source.takeError(),
[&](const llvm::ErrorInfoBase& ei) {
ei.log(error_stream);
error_stream << "\n";
ei.log(error_stream_);
error_stream_ << "\n";
});
return false;
}
auto tokenized_source =
TokenizedBuffer::Lex(*source, ConsoleDiagnosticConsumer());
tokenized_source.Print(output_stream);
tokenized_source.Print(output_stream_);
return !tokenized_source.HasErrors();
}
auto Driver::RunDumpParseTreeSubcommand(llvm::ArrayRef<llvm::StringRef> args)
-> bool {
if (args.empty()) {
error_stream << "ERROR: No input file specified.\n";
error_stream_ << "ERROR: No input file specified.\n";
return false;
}
@@ -139,11 +139,11 @@ auto Driver::RunDumpParseTreeSubcommand(llvm::ArrayRef<llvm::StringRef> args)
auto source = SourceBuffer::CreateFromFile(input_file_name);
if (!source) {
error_stream << "ERROR: Unable to open input source file: ";
error_stream_ << "ERROR: Unable to open input source file: ";
llvm::handleAllErrors(source.takeError(),
[&](const llvm::ErrorInfoBase& ei) {
ei.log(error_stream);
error_stream << "\n";
ei.log(error_stream_);
error_stream_ << "\n";
});
return false;
}
@@ -151,19 +151,19 @@ auto Driver::RunDumpParseTreeSubcommand(llvm::ArrayRef<llvm::StringRef> args)
TokenizedBuffer::Lex(*source, ConsoleDiagnosticConsumer());
auto parse_tree =
ParseTree::Parse(tokenized_source, ConsoleDiagnosticConsumer());
parse_tree.Print(output_stream);
parse_tree.Print(output_stream_);
return !tokenized_source.HasErrors() && !parse_tree.HasErrors();
}
auto Driver::ReportExtraArgs(llvm::StringRef subcommand_text,
llvm::ArrayRef<llvm::StringRef> args) -> void {
error_stream << "ERROR: Unexpected additional arguments to the '"
<< subcommand_text << "' subcommand:";
error_stream_ << "ERROR: Unexpected additional arguments to the '"
<< subcommand_text << "' subcommand:";
for (auto arg : args) {
error_stream << " " << arg;
error_stream_ << " " << arg;
}
error_stream << "\n";
error_stream_ << "\n";
}
} // namespace Carbon