Driver: Switch -ccc-* options to using the standard options functionality.
- I still want to get rid of them, but manually handling them isn't adding value.
llvm-svn: 90602
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index 7c21594..672c890 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -113,81 +113,53 @@
const char **Start = argv + 1, **End = argv + argc;
const char *HostTriple = DefaultHostTriple.c_str();
- // Read -ccc args.
+ InputArgList *Args = ParseArgStrings(Start, End);
+
+ // Extract -ccc args.
//
// FIXME: We need to figure out where this behavior should live. Most of it
// should be outside in the client; the parts that aren't should have proper
// options, either by introducing new ones or by overloading gcc ones like -V
// or -b.
- for (; Start != End && memcmp(*Start, "-ccc-", 5) == 0; ++Start) {
- const char *Opt = *Start + 5;
+ CCCPrintOptions = Args->hasArg(options::OPT_ccc_print_options);
+ CCCPrintActions = Args->hasArg(options::OPT_ccc_print_phases);
+ CCCPrintBindings = Args->hasArg(options::OPT_ccc_print_bindings);
+ CCCIsCXX = Args->hasArg(options::OPT_ccc_cxx);
+ CCCEcho = Args->hasArg(options::OPT_ccc_echo);
+ if (const Arg *A = Args->getLastArg(options::OPT_ccc_gcc_name))
+ CCCGenericGCCName = A->getValue(*Args);
+ CCCUseClangCXX = Args->hasFlag(options::OPT_ccc_clang_cxx,
+ options::OPT_ccc_no_clang_cxx);
+ CCCUsePCH = Args->hasFlag(options::OPT_ccc_pch_is_pch,
+ options::OPT_ccc_pch_is_pth);
+ CCCUseClang = !Args->hasArg(options::OPT_ccc_no_clang);
+ CCCUseClangCPP = !Args->hasArg(options::OPT_ccc_no_clang_cpp);
+ if (const Arg *A = Args->getLastArg(options::OPT_ccc_clang_archs)) {
+ llvm::StringRef Cur = A->getValue(*Args);
- if (!strcmp(Opt, "print-options")) {
- CCCPrintOptions = true;
- } else if (!strcmp(Opt, "print-phases")) {
- CCCPrintActions = true;
- } else if (!strcmp(Opt, "print-bindings")) {
- CCCPrintBindings = true;
- } else if (!strcmp(Opt, "cxx")) {
- CCCIsCXX = true;
- } else if (!strcmp(Opt, "echo")) {
- CCCEcho = true;
+ CCCClangArchs.clear();
+ while (!Cur.empty()) {
+ std::pair<llvm::StringRef, llvm::StringRef> Split = Cur.split(',');
- } else if (!strcmp(Opt, "gcc-name")) {
- assert(Start+1 < End && "FIXME: -ccc- argument handling.");
- CCCGenericGCCName = *++Start;
+ if (!Split.first.empty()) {
+ llvm::Triple::ArchType Arch =
+ llvm::Triple(Split.first, "", "").getArch();
- } else if (!strcmp(Opt, "clang-cxx")) {
- CCCUseClangCXX = true;
- } else if (!strcmp(Opt, "no-clang-cxx")) {
- CCCUseClangCXX = false;
- } else if (!strcmp(Opt, "pch-is-pch")) {
- CCCUsePCH = true;
- } else if (!strcmp(Opt, "pch-is-pth")) {
- CCCUsePCH = false;
- } else if (!strcmp(Opt, "no-clang")) {
- CCCUseClang = false;
- } else if (!strcmp(Opt, "no-clang-cpp")) {
- CCCUseClangCPP = false;
- } else if (!strcmp(Opt, "clang-archs")) {
- assert(Start+1 < End && "FIXME: -ccc- argument handling.");
- llvm::StringRef Cur = *++Start;
-
- CCCClangArchs.clear();
- while (!Cur.empty()) {
- std::pair<llvm::StringRef, llvm::StringRef> Split = Cur.split(',');
-
- if (!Split.first.empty()) {
- llvm::Triple::ArchType Arch =
- llvm::Triple(Split.first, "", "").getArch();
-
- if (Arch == llvm::Triple::UnknownArch) {
- // FIXME: Error handling.
- llvm::errs() << "invalid arch name: " << Split.first << "\n";
- exit(1);
- }
-
- CCCClangArchs.insert(Arch);
+ if (Arch == llvm::Triple::UnknownArch) {
+ Diag(clang::diag::err_drv_invalid_arch_name) << Arch;
+ continue;
}
- Cur = Split.second;
+ CCCClangArchs.insert(Arch);
}
- } else if (!strcmp(Opt, "host-triple")) {
- assert(Start+1 < End && "FIXME: -ccc- argument handling.");
- HostTriple = *++Start;
- } else if (!strcmp(Opt, "install-dir")) {
- assert(Start+1 < End && "FIXME: -ccc- argument handling.");
- Dir = *++Start;
-
- } else {
- // FIXME: Error handling.
- llvm::errs() << "invalid option: " << *Start << "\n";
- exit(1);
+ Cur = Split.second;
}
}
-
- InputArgList *Args = ParseArgStrings(Start, End);
+ if (const Arg *A = Args->getLastArg(options::OPT_ccc_host_triple))
+ HostTriple = A->getValue(*Args);
+ if (const Arg *A = Args->getLastArg(options::OPT_ccc_install_dir))
+ Dir = A->getValue(*Args);
Host = GetHostInfo(HostTriple);
@@ -287,112 +259,11 @@
}
}
-static std::string getOptionHelpName(const OptTable &Opts, options::ID Id) {
- std::string Name = Opts.getOptionName(Id);
-
- // Add metavar, if used.
- switch (Opts.getOptionKind(Id)) {
- case Option::GroupClass: case Option::InputClass: case Option::UnknownClass:
- assert(0 && "Invalid option with help text.");
-
- case Option::MultiArgClass: case Option::JoinedAndSeparateClass:
- assert(0 && "Cannot print metavar for this kind of option.");
-
- case Option::FlagClass:
- break;
-
- case Option::SeparateClass: case Option::JoinedOrSeparateClass:
- Name += ' ';
- // FALLTHROUGH
- case Option::JoinedClass: case Option::CommaJoinedClass:
- Name += Opts.getOptionMetaVar(Id);
- break;
- }
-
- return Name;
-}
-
// FIXME: Move -ccc options to real options in the .td file (or eliminate), and
// then move to using OptTable::PrintHelp.
void Driver::PrintHelp(bool ShowHidden) const {
- llvm::raw_ostream &OS = llvm::outs();
-
- OS << "OVERVIEW: clang \"gcc-compatible\" driver\n";
- OS << '\n';
- OS << "USAGE: " << Name << " [options] <input files>\n";
- OS << '\n';
- OS << "OPTIONS:\n";
-
- // Render help text into (option, help) pairs.
- std::vector< std::pair<std::string, const char*> > OptionHelp;
-
- for (unsigned i = 0, e = getOpts().getNumOptions(); i != e; ++i) {
- options::ID Id = (options::ID) (i + 1);
- if (const char *Text = getOpts().getOptionHelpText(Id))
- OptionHelp.push_back(std::make_pair(getOptionHelpName(getOpts(), Id),
- Text));
- }
-
- if (ShowHidden) {
- OptionHelp.push_back(std::make_pair("\nDRIVER OPTIONS:",""));
- OptionHelp.push_back(std::make_pair("-ccc-cxx",
- "Act as a C++ driver"));
- OptionHelp.push_back(std::make_pair("-ccc-gcc-name",
- "Name for native GCC compiler"));
- OptionHelp.push_back(std::make_pair("-ccc-clang-cxx",
- "Enable the clang compiler for C++"));
- OptionHelp.push_back(std::make_pair("-ccc-no-clang-cxx",
- "Disable the clang compiler for C++"));
- OptionHelp.push_back(std::make_pair("-ccc-no-clang",
- "Disable the clang compiler"));
- OptionHelp.push_back(std::make_pair("-ccc-no-clang-cpp",
- "Disable the clang preprocessor"));
- OptionHelp.push_back(std::make_pair("-ccc-clang-archs",
- "Comma separate list of architectures "
- "to use the clang compiler for"));
- OptionHelp.push_back(std::make_pair("-ccc-pch-is-pch",
- "Use lazy PCH for precompiled headers"));
- OptionHelp.push_back(std::make_pair("-ccc-pch-is-pth",
- "Use pretokenized headers for precompiled headers"));
-
- OptionHelp.push_back(std::make_pair("\nDEBUG/DEVELOPMENT OPTIONS:",""));
- OptionHelp.push_back(std::make_pair("-ccc-host-triple",
- "Simulate running on the given target"));
- OptionHelp.push_back(std::make_pair("-ccc-install-dir",
- "Simulate installation in the given directory"));
- OptionHelp.push_back(std::make_pair("-ccc-print-options",
- "Dump parsed command line arguments"));
- OptionHelp.push_back(std::make_pair("-ccc-print-phases",
- "Dump list of actions to perform"));
- OptionHelp.push_back(std::make_pair("-ccc-print-bindings",
- "Show bindings of tools to actions"));
- OptionHelp.push_back(std::make_pair("CCC_ADD_ARGS",
- "(ENVIRONMENT VARIABLE) Comma separated list of "
- "arguments to prepend to the command line"));
- }
-
- // Find the maximum option length.
- unsigned OptionFieldWidth = 0;
- for (unsigned i = 0, e = OptionHelp.size(); i != e; ++i) {
- // Skip titles.
- if (!OptionHelp[i].second)
- continue;
-
- // Limit the amount of padding we are willing to give up for alignment.
- unsigned Length = OptionHelp[i].first.size();
- if (Length <= 23)
- OptionFieldWidth = std::max(OptionFieldWidth, Length);
- }
-
- for (unsigned i = 0, e = OptionHelp.size(); i != e; ++i) {
- const std::string &Option = OptionHelp[i].first;
- OS << " " << Option;
- for (int j = Option.length(), e = OptionFieldWidth; j < e; ++j)
- OS << ' ';
- OS << ' ' << OptionHelp[i].second << '\n';
- }
-
- OS.flush();
+ getOpts().PrintHelp(llvm::outs(), Name.c_str(),
+ "clang \"gcc-compatible\" driver", ShowHidden);
}
void Driver::PrintVersion(const Compilation &C, llvm::raw_ostream &OS) const {