|
|
@@ -2,10 +2,8 @@
|
|
|
// Exceptions. See /LICENSE for license information.
|
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
|
|
|
|
-#include "driver/driver.h"
|
|
|
+#include "toolchain/driver/driver.h"
|
|
|
|
|
|
-#include "diagnostics/diagnostic_emitter.h"
|
|
|
-#include "lexer/tokenized_buffer.h"
|
|
|
#include "llvm/ADT/ArrayRef.h"
|
|
|
#include "llvm/ADT/StringExtras.h"
|
|
|
#include "llvm/ADT/StringRef.h"
|
|
|
@@ -13,7 +11,9 @@
|
|
|
#include "llvm/Support/Error.h"
|
|
|
#include "llvm/Support/ErrorHandling.h"
|
|
|
#include "llvm/Support/Format.h"
|
|
|
-#include "source/source_buffer.h"
|
|
|
+#include "toolchain/diagnostics/diagnostic_emitter.h"
|
|
|
+#include "toolchain/lexer/tokenized_buffer.h"
|
|
|
+#include "toolchain/source/source_buffer.h"
|
|
|
|
|
|
namespace Carbon {
|
|
|
|
|
|
@@ -21,14 +21,14 @@ namespace {
|
|
|
|
|
|
enum class Subcommand {
|
|
|
#define CARBON_SUBCOMMAND(Name, ...) Name,
|
|
|
-#include "driver/flags.def"
|
|
|
+#include "toolchain/driver/flags.def"
|
|
|
Unknown,
|
|
|
};
|
|
|
|
|
|
auto GetSubcommand(llvm::StringRef name) -> Subcommand {
|
|
|
return llvm::StringSwitch<Subcommand>(name)
|
|
|
#define CARBON_SUBCOMMAND(Name, Spelling, ...) .Case(Spelling, Subcommand::Name)
|
|
|
-#include "driver/flags.def"
|
|
|
+#include "toolchain/driver/flags.def"
|
|
|
.Default(Subcommand::Unknown);
|
|
|
}
|
|
|
|
|
|
@@ -52,7 +52,7 @@ auto Driver::RunFullCommand(llvm::ArrayRef<llvm::StringRef> args) -> bool {
|
|
|
#define CARBON_SUBCOMMAND(Name, ...) \
|
|
|
case Subcommand::Name: \
|
|
|
return Run##Name##Subcommand(subcommand_args);
|
|
|
-#include "driver/flags.def"
|
|
|
+#include "toolchain/driver/flags.def"
|
|
|
}
|
|
|
llvm_unreachable("All subcommands handled!");
|
|
|
}
|
|
|
@@ -69,7 +69,7 @@ auto Driver::RunHelpSubcommand(llvm::ArrayRef<llvm::StringRef> args) -> bool {
|
|
|
|
|
|
constexpr llvm::StringLiteral SubcommandsAndHelp[][2] = {
|
|
|
#define CARBON_SUBCOMMAND(Name, Spelling, HelpText) {Spelling, HelpText},
|
|
|
-#include "driver/flags.def"
|
|
|
+#include "toolchain/driver/flags.def"
|
|
|
};
|
|
|
|
|
|
int max_subcommand_width = 0;
|