https://github.com/jurahul created
https://github.com/llvm/llvm-project/pull/110692
Rename option parsing related files from OptXYZ -> OptionXYZ, since Opt could
be confused with optimization and Opt as a short hand for Option is not really
that smaller to warrant its use.
>From 7ee776230f113853ac39a03d13c13a6ca9480bc6 Mon Sep 17 00:00:00 2001
From: Rahul Joshi <rjo...@nvidia.com>
Date: Tue, 1 Oct 2024 09:03:33 -0700
Subject: [PATCH] [NFC] Rename Option parsing related files from OptXYZ ->
OptionXYZ
Rename option parsing related files from OptXYZ -> OptionXYZ, since
Opt could be confused with optimization and Opt as a short hand
for Option is not really that smaller to warrant its use.
---
clang-tools-extra/modularize/Modularize.cpp | 2 +-
clang-tools-extra/pp-trace/PPTrace.cpp | 2 +-
clang/docs/InternalsManual.rst | 2 +-
clang/include/clang/Driver/OptionUtils.h | 2 +-
clang/include/clang/Driver/Options.h | 2 +-
clang/include/clang/Driver/Options.td | 2 +-
clang/lib/Driver/Compilation.cpp | 2 +-
clang/lib/Driver/Driver.cpp | 4 +-
clang/lib/Driver/DriverOptions.cpp | 2 +-
clang/lib/Driver/ToolChain.cpp | 2 +-
clang/lib/Frontend/CompilerInvocation.cpp | 4 +-
.../ExecuteCompilerInvocation.cpp | 2 +-
.../InterpolatingCompilationDatabase.cpp | 2 +-
clang/lib/Tooling/Tooling.cpp | 2 +-
clang/tools/clang-check/ClangCheck.cpp | 2 +-
.../tools/clang-installapi/InstallAPIOpts.td | 2 +-
.../ClangLinkerWrapper.cpp | 2 +-
.../clang-linker-wrapper/LinkerWrapperOpts.td | 2 +-
.../ClangNVLinkWrapper.cpp | 2 +-
.../tools/clang-nvlink-wrapper/NVLinkOpts.td | 2 +-
clang/tools/clang-scan-deps/Opts.td | 2 +-
clang/tools/driver/cc1_main.cpp | 2 +-
clang/tools/driver/cc1as_main.cpp | 2 +-
clang/tools/driver/driver.cpp | 2 +-
flang/lib/Frontend/CompilerInvocation.cpp | 2 +-
.../ExecuteCompilerInvocation.cpp | 2 +-
flang/tools/flang-driver/fc1_main.cpp | 2 +-
lld/COFF/Options.td | 2 +-
lld/ELF/Options.td | 2 +-
lld/MachO/Driver.h | 2 +-
lld/MachO/Options.td | 2 +-
lld/MinGW/Options.td | 2 +-
lld/wasm/Options.td | 2 +-
lldb/tools/driver/Options.td | 2 +-
lldb/tools/lldb-dap/Options.td | 2 +-
lldb/tools/lldb-dap/lldb-dap.cpp | 2 +-
lldb/tools/lldb-server/LLGSOptions.td | 2 +-
lldb/tools/lldb-server/lldb-gdbserver.cpp | 2 +-
llvm/include/llvm/Option/ArgList.h | 4 +-
llvm/include/llvm/Option/Option.h | 4 +-
.../Option/{OptParser.td => OptionParser.td} | 8 +--
.../{OptSpecifier.h => OptionSpecifier.h} | 8 +--
.../llvm/Option/{OptTable.h => OptionTable.h} | 17 +++--
.../ExecutionEngine/JITLink/COFFOptions.td | 2 +-
llvm/lib/Option/ArgList.cpp | 6 +-
llvm/lib/Option/CMakeLists.txt | 2 +-
llvm/lib/Option/Option.cpp | 2 +-
.../Option/{OptTable.cpp => OptionTable.cpp} | 65 ++++++++++---------
.../llvm-dlltool/DlltoolDriver.cpp | 2 +-
llvm/lib/ToolDrivers/llvm-dlltool/Options.td | 2 +-
llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp | 2 +-
llvm/lib/ToolDrivers/llvm-lib/Options.td | 2 +-
llvm/tools/dsymutil/Options.td | 2 +-
llvm/tools/llvm-cgdata/Opts.td | 2 +-
llvm/tools/llvm-cvtres/Opts.td | 2 +-
llvm/tools/llvm-cxxfilt/Opts.td | 2 +-
llvm/tools/llvm-debuginfod-find/Opts.td | 2 +-
llvm/tools/llvm-debuginfod/Opts.td | 2 +-
llvm/tools/llvm-dwarfutil/Options.td | 2 +-
llvm/tools/llvm-dwp/Opts.td | 2 +-
llvm/tools/llvm-gsymutil/Opts.td | 2 +-
llvm/tools/llvm-ifs/Opts.td | 2 +-
llvm/tools/llvm-libtool-darwin/Opts.td | 2 +-
llvm/tools/llvm-lipo/LipoOpts.td | 2 +-
llvm/tools/llvm-ml/Opts.td | 2 +-
llvm/tools/llvm-mt/Opts.td | 2 +-
llvm/tools/llvm-nm/Opts.td | 2 +-
llvm/tools/llvm-objcopy/BitcodeStripOpts.td | 2 +-
llvm/tools/llvm-objcopy/CommonOpts.td | 2 +-
.../tools/llvm-objcopy/InstallNameToolOpts.td | 2 +-
llvm/tools/llvm-objdump/ObjdumpOptID.h | 2 +-
llvm/tools/llvm-objdump/ObjdumpOpts.td | 2 +-
llvm/tools/llvm-objdump/OtoolOpts.td | 2 +-
llvm/tools/llvm-rc/Opts.td | 2 +-
llvm/tools/llvm-rc/WindresOpts.td | 2 +-
llvm/tools/llvm-rc/llvm-rc.cpp | 2 +-
llvm/tools/llvm-readobj/Opts.td | 2 +-
llvm/tools/llvm-readtapi/TapiOpts.td | 2 +-
llvm/tools/llvm-size/Opts.td | 2 +-
llvm/tools/llvm-strings/Opts.td | 2 +-
llvm/tools/llvm-symbolizer/Opts.td | 2 +-
llvm/tools/llvm-tli-checker/Opts.td | 2 +-
llvm/tools/sancov/Opts.td | 2 +-
llvm/unittests/Option/OptionParsingTest.cpp | 2 +-
llvm/unittests/Option/Opts.td | 2 +-
llvm/utils/TableGen/Common/CMakeLists.txt | 2 +-
.../{OptEmitter.cpp => OptionEmitter.cpp} | 4 +-
.../Common/{OptEmitter.h => OptionEmitter.h} | 8 +--
llvm/utils/TableGen/OptionParserEmitter.cpp | 2 +-
llvm/utils/TableGen/OptionRSTEmitter.cpp | 2 +-
90 files changed, 146 insertions(+), 144 deletions(-)
rename llvm/include/llvm/Option/{OptParser.td => OptionParser.td} (98%)
rename llvm/include/llvm/Option/{OptSpecifier.h => OptionSpecifier.h} (83%)
rename llvm/include/llvm/Option/{OptTable.h => OptionTable.h} (97%)
rename llvm/lib/Option/{OptTable.cpp => OptionTable.cpp} (94%)
rename llvm/utils/TableGen/Common/{OptEmitter.cpp => OptionEmitter.cpp} (95%)
rename llvm/utils/TableGen/Common/{OptEmitter.h => OptionEmitter.h} (68%)
diff --git a/clang-tools-extra/modularize/Modularize.cpp
b/clang-tools-extra/modularize/Modularize.cpp
index 4bb3bae0503acd..7c3f82fcf749b7 100644
--- a/clang-tools-extra/modularize/Modularize.cpp
+++ b/clang-tools-extra/modularize/Modularize.cpp
@@ -240,8 +240,8 @@
#include "clang/Tooling/Tooling.h"
#include "llvm/Option/Arg.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptTable.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/MemoryBuffer.h"
diff --git a/clang-tools-extra/pp-trace/PPTrace.cpp
b/clang-tools-extra/pp-trace/PPTrace.cpp
index 0b078c49a55b7a..cd1e9ab8f604e4 100644
--- a/clang-tools-extra/pp-trace/PPTrace.cpp
+++ b/clang-tools-extra/pp-trace/PPTrace.cpp
@@ -37,8 +37,8 @@
#include "clang/Tooling/Tooling.h"
#include "llvm/Option/Arg.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptTable.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/GlobPattern.h"
diff --git a/clang/docs/InternalsManual.rst b/clang/docs/InternalsManual.rst
index b70ec35f3da229..acdd55acb50c81 100644
--- a/clang/docs/InternalsManual.rst
+++ b/clang/docs/InternalsManual.rst
@@ -672,7 +672,7 @@ variable for the option value:
Next, declare the command line interface of the option in the tablegen file
``clang/include/clang/Driver/Options.td``. This is done by instantiating the
-``Option`` class (defined in ``llvm/include/llvm/Option/OptParser.td``). The
+``Option`` class (defined in ``llvm/include/llvm/Option/OptionParser.td``). The
instance is typically created through one of the helper classes that encode the
acceptable ways to specify the option value on the command line:
diff --git a/clang/include/clang/Driver/OptionUtils.h
b/clang/include/clang/Driver/OptionUtils.h
index 922f536bf33eac..67c3e81a0d4c9d 100644
--- a/clang/include/clang/Driver/OptionUtils.h
+++ b/clang/include/clang/Driver/OptionUtils.h
@@ -15,7 +15,7 @@
#include "clang/Basic/Diagnostic.h"
#include "clang/Basic/LLVM.h"
-#include "llvm/Option/OptSpecifier.h"
+#include "llvm/Option/OptionSpecifier.h"
namespace llvm {
diff --git a/clang/include/clang/Driver/Options.h
b/clang/include/clang/Driver/Options.h
index 0797410e9940e2..b9e7f01d0e3ce8 100644
--- a/clang/include/clang/Driver/Options.h
+++ b/clang/include/clang/Driver/Options.h
@@ -9,8 +9,8 @@
#ifndef LLVM_CLANG_DRIVER_OPTIONS_H
#define LLVM_CLANG_DRIVER_OPTIONS_H
-#include "llvm/Option/OptTable.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionTable.h"
namespace clang {
namespace driver {
diff --git a/clang/include/clang/Driver/Options.td
b/clang/include/clang/Driver/Options.td
index 9d183ff2d69b3c..b55ff03d9919e3 100644
--- a/clang/include/clang/Driver/Options.td
+++ b/clang/include/clang/Driver/Options.td
@@ -11,7 +11,7 @@
//===----------------------------------------------------------------------===//
// Include the common option parsing interfaces.
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
// When generating documentation, we expect there to be a GlobalDocumentation
// def containing the program name that we are generating documentation for.
diff --git a/clang/lib/Driver/Compilation.cpp b/clang/lib/Driver/Compilation.cpp
index ad077d5bbfa69a..e7f658e6b47c10 100644
--- a/clang/lib/Driver/Compilation.cpp
+++ b/clang/lib/Driver/Compilation.cpp
@@ -18,8 +18,8 @@
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptSpecifier.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionSpecifier.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/TargetParser/Triple.h"
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index fba6a8853c3960..ee21306d35063d 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -75,9 +75,9 @@
#include "llvm/MC/TargetRegistry.h"
#include "llvm/Option/Arg.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptSpecifier.h"
-#include "llvm/Option/OptTable.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionSpecifier.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/ExitCodes.h"
diff --git a/clang/lib/Driver/DriverOptions.cpp
b/clang/lib/Driver/DriverOptions.cpp
index b25801a8f3f494..9248861833f420 100644
--- a/clang/lib/Driver/DriverOptions.cpp
+++ b/clang/lib/Driver/DriverOptions.cpp
@@ -8,8 +8,8 @@
#include "clang/Driver/Options.h"
#include "llvm/ADT/STLExtras.h"
-#include "llvm/Option/OptTable.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionTable.h"
#include <cassert>
using namespace clang::driver;
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
index 16f9b629fc538c..235e8c236004f3 100644
--- a/clang/lib/Driver/ToolChain.cpp
+++ b/clang/lib/Driver/ToolChain.cpp
@@ -35,8 +35,8 @@
#include "llvm/MC/TargetRegistry.h"
#include "llvm/Option/Arg.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptTable.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/FileUtilities.h"
diff --git a/clang/lib/Frontend/CompilerInvocation.cpp
b/clang/lib/Frontend/CompilerInvocation.cpp
index a0291ccfea2458..0c74576ec6ffb5 100644
--- a/clang/lib/Frontend/CompilerInvocation.cpp
+++ b/clang/lib/Frontend/CompilerInvocation.cpp
@@ -63,9 +63,9 @@
#include "llvm/MC/MCTargetOptions.h"
#include "llvm/Option/Arg.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptSpecifier.h"
-#include "llvm/Option/OptTable.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionSpecifier.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/ProfileData/InstrProfReader.h"
#include "llvm/Remarks/HotnessThresholdParser.h"
#include "llvm/Support/CodeGen.h"
diff --git a/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
b/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
index 7476b1076d1038..69c8eb994089a5 100644
--- a/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
+++ b/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
@@ -26,8 +26,8 @@
#include "clang/Rewrite/Frontend/FrontendActions.h"
#include "clang/StaticAnalyzer/Frontend/AnalyzerHelpFlags.h"
#include "clang/StaticAnalyzer/Frontend/FrontendActions.h"
-#include "llvm/Option/OptTable.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/BuryPointer.h"
#include "llvm/Support/DynamicLibrary.h"
#include "llvm/Support/ErrorHandling.h"
diff --git a/clang/lib/Tooling/InterpolatingCompilationDatabase.cpp
b/clang/lib/Tooling/InterpolatingCompilationDatabase.cpp
index 995019ca5a4d49..124116dc2b53d4 100644
--- a/clang/lib/Tooling/InterpolatingCompilationDatabase.cpp
+++ b/clang/lib/Tooling/InterpolatingCompilationDatabase.cpp
@@ -51,7 +51,7 @@
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/StringExtras.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptTable.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/StringSaver.h"
diff --git a/clang/lib/Tooling/Tooling.cpp b/clang/lib/Tooling/Tooling.cpp
index ffacf9cf1f7829..581f123253fb4e 100644
--- a/clang/lib/Tooling/Tooling.cpp
+++ b/clang/lib/Tooling/Tooling.cpp
@@ -40,8 +40,8 @@
#include "llvm/ADT/StringRef.h"
#include "llvm/ADT/Twine.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptTable.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/Casting.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/Debug.h"
diff --git a/clang/tools/clang-check/ClangCheck.cpp
b/clang/tools/clang-check/ClangCheck.cpp
index fa6dd06a1ee58e..0fae93039acfc0 100644
--- a/clang/tools/clang-check/ClangCheck.cpp
+++ b/clang/tools/clang-check/ClangCheck.cpp
@@ -29,7 +29,7 @@
#include "clang/Tooling/Syntax/Tree.h"
#include "clang/Tooling/Tooling.h"
#include "llvm/ADT/STLExtras.h"
-#include "llvm/Option/OptTable.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/Signals.h"
#include "llvm/Support/TargetSelect.h"
diff --git a/clang/tools/clang-installapi/InstallAPIOpts.td
b/clang/tools/clang-installapi/InstallAPIOpts.td
index fc0fbe929c8878..045999fd00517b 100644
--- a/clang/tools/clang-installapi/InstallAPIOpts.td
+++ b/clang/tools/clang-installapi/InstallAPIOpts.td
@@ -11,7 +11,7 @@
//===----------------------------------------------------------------------===//
// Include the common option parsing interfaces.
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
/////////
diff --git a/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
b/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
index 9fea1fdcd5fb46..6b7d9aabe2e420 100644
--- a/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
+++ b/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
@@ -36,8 +36,8 @@
#include "llvm/Object/ObjectFile.h"
#include "llvm/Object/OffloadBinary.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptTable.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Passes/PassPlugin.h"
#include "llvm/Remarks/HotnessThresholdParser.h"
#include "llvm/Support/CommandLine.h"
diff --git a/clang/tools/clang-linker-wrapper/LinkerWrapperOpts.td
b/clang/tools/clang-linker-wrapper/LinkerWrapperOpts.td
index a3e8199380046f..ac228a90c3b25a 100644
--- a/clang/tools/clang-linker-wrapper/LinkerWrapperOpts.td
+++ b/clang/tools/clang-linker-wrapper/LinkerWrapperOpts.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
def WrapperOnlyOption : OptionFlag;
def DeviceOnlyOption : OptionFlag;
diff --git a/clang/tools/clang-nvlink-wrapper/ClangNVLinkWrapper.cpp
b/clang/tools/clang-nvlink-wrapper/ClangNVLinkWrapper.cpp
index b4b376fe0d114e..8f811182df6cbe 100644
--- a/clang/tools/clang-nvlink-wrapper/ClangNVLinkWrapper.cpp
+++ b/clang/tools/clang-nvlink-wrapper/ClangNVLinkWrapper.cpp
@@ -30,8 +30,8 @@
#include "llvm/Object/ObjectFile.h"
#include "llvm/Object/OffloadBinary.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptTable.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Remarks/HotnessThresholdParser.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/FileOutputBuffer.h"
diff --git a/clang/tools/clang-nvlink-wrapper/NVLinkOpts.td
b/clang/tools/clang-nvlink-wrapper/NVLinkOpts.td
index eeb9d1a6228240..4ba015fa0db46b 100644
--- a/clang/tools/clang-nvlink-wrapper/NVLinkOpts.td
+++ b/clang/tools/clang-nvlink-wrapper/NVLinkOpts.td
@@ -1,7 +1,7 @@
// We try to create options similar to lld's. That way, options passed to
clang
// -Xoffload-linker can be the same whether offloading to nvptx or amdgpu.
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
def WrapperOnlyOption : OptionFlag;
diff --git a/clang/tools/clang-scan-deps/Opts.td
b/clang/tools/clang-scan-deps/Opts.td
index 4837ce6f070d73..d26f8436cb117d 100644
--- a/clang/tools/clang-scan-deps/Opts.td
+++ b/clang/tools/clang-scan-deps/Opts.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
class F<string name, string help> : Flag<["-"], name>, HelpText<help>;
class Arg<string name, string help> : Separate<["-"], name>, HelpText<help>;
diff --git a/clang/tools/driver/cc1_main.cpp b/clang/tools/driver/cc1_main.cpp
index 554dc956c7cfe3..e658d939b33a74 100644
--- a/clang/tools/driver/cc1_main.cpp
+++ b/clang/tools/driver/cc1_main.cpp
@@ -34,7 +34,7 @@
#include "llvm/MC/TargetRegistry.h"
#include "llvm/Option/Arg.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptTable.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/BuryPointer.h"
#include "llvm/Support/Compiler.h"
#include "llvm/Support/ErrorHandling.h"
diff --git a/clang/tools/driver/cc1as_main.cpp
b/clang/tools/driver/cc1as_main.cpp
index 7fe97cc6e6ace1..644ad60ba865fb 100644
--- a/clang/tools/driver/cc1as_main.cpp
+++ b/clang/tools/driver/cc1as_main.cpp
@@ -39,7 +39,7 @@
#include "llvm/MC/TargetRegistry.h"
#include "llvm/Option/Arg.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptTable.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/FileSystem.h"
diff --git a/clang/tools/driver/driver.cpp b/clang/tools/driver/driver.cpp
index 686eaea0aa7c83..36f4c3b0752718 100644
--- a/clang/tools/driver/driver.cpp
+++ b/clang/tools/driver/driver.cpp
@@ -31,8 +31,8 @@
#include "llvm/ADT/StringSet.h"
#include "llvm/Config/llvm-config.h" // for LLVM_ON_UNIX
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptTable.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/BuryPointer.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/CrashRecoveryContext.h"
diff --git a/flang/lib/Frontend/CompilerInvocation.cpp
b/flang/lib/Frontend/CompilerInvocation.cpp
index 2154b9ab2fbf47..f0926fcd09dbf4 100644
--- a/flang/lib/Frontend/CompilerInvocation.cpp
+++ b/flang/lib/Frontend/CompilerInvocation.cpp
@@ -31,7 +31,7 @@
#include "llvm/Frontend/Debug/Options.h"
#include "llvm/Option/Arg.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptTable.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/CodeGen.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/FileUtilities.h"
diff --git a/flang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
b/flang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
index e2cbd5112d6ea5..4d217e004c6381 100644
--- a/flang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
+++ b/flang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
@@ -24,8 +24,8 @@
#include "mlir/Pass/PassManager.h"
#include "clang/Basic/DiagnosticFrontend.h"
#include "clang/Driver/Options.h"
-#include "llvm/Option/OptTable.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/BuryPointer.h"
#include "llvm/Support/CommandLine.h"
diff --git a/flang/tools/flang-driver/fc1_main.cpp
b/flang/tools/flang-driver/fc1_main.cpp
index b5b062aaac2671..74889506440d6f 100644
--- a/flang/tools/flang-driver/fc1_main.cpp
+++ b/flang/tools/flang-driver/fc1_main.cpp
@@ -23,7 +23,7 @@
#include "clang/Driver/DriverDiagnostic.h"
#include "llvm/Option/Arg.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptTable.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/TargetSelect.h"
#include <cstdio>
diff --git a/lld/COFF/Options.td b/lld/COFF/Options.td
index 7ceb824c068de3..3979213cfc3bd2 100644
--- a/lld/COFF/Options.td
+++ b/lld/COFF/Options.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
// link.exe accepts options starting with either a dash or a slash.
diff --git a/lld/ELF/Options.td b/lld/ELF/Options.td
index c80c4017d3512c..4c47c16b7a2f0e 100644
--- a/lld/ELF/Options.td
+++ b/lld/ELF/Options.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
// Convenience classes for long options which only accept two dashes. For lld
// specific or newer long options, we prefer two dashes to avoid collision with
diff --git a/lld/MachO/Driver.h b/lld/MachO/Driver.h
index 82cd1880ecab1b..17f74931bf47dc 100644
--- a/lld/MachO/Driver.h
+++ b/lld/MachO/Driver.h
@@ -13,7 +13,7 @@
#include "llvm/ADT/SetVector.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/BinaryFormat/MachO.h"
-#include "llvm/Option/OptTable.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/MemoryBuffer.h"
#include <optional>
diff --git a/lld/MachO/Options.td b/lld/MachO/Options.td
index 70eb7c8b9e466b..f4b5cfa489c996 100644
--- a/lld/MachO/Options.td
+++ b/lld/MachO/Options.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
multiclass BB<string name, string help1, string help2> {
def NAME: Flag<["--"], name>, HelpText<help1>;
diff --git a/lld/MinGW/Options.td b/lld/MinGW/Options.td
index ff7e21fa808f39..424c789d6ab44d 100644
--- a/lld/MinGW/Options.td
+++ b/lld/MinGW/Options.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
class F<string name>: Flag<["--", "-"], name>;
class J<string name>: Joined<["--", "-"], name>;
diff --git a/lld/wasm/Options.td b/lld/wasm/Options.td
index c5febd145a54f3..ecc9877fd8b5d3 100644
--- a/lld/wasm/Options.td
+++ b/lld/wasm/Options.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
// Convenience classes for long options which only accept two dashes. For lld
// specific or newer long options, we prefer two dashes to avoid collision with
diff --git a/lldb/tools/driver/Options.td b/lldb/tools/driver/Options.td
index a24fb3826b9091..a1730560b7e261 100644
--- a/lldb/tools/driver/Options.td
+++ b/lldb/tools/driver/Options.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
class F<string name>: Flag<["--", "-"], name>;
class S<string name>: Separate<["--", "-"], name>;
diff --git a/lldb/tools/lldb-dap/Options.td b/lldb/tools/lldb-dap/Options.td
index d7b4a065abec01..a0b552526ba9d3 100644
--- a/lldb/tools/lldb-dap/Options.td
+++ b/lldb/tools/lldb-dap/Options.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
class F<string name>: Flag<["--", "-"], name>;
class S<string name>: Separate<["--", "-"], name>;
diff --git a/lldb/tools/lldb-dap/lldb-dap.cpp b/lldb/tools/lldb-dap/lldb-dap.cpp
index db4dbbd6f6200a..5c3acb27bbc502 100644
--- a/lldb/tools/lldb-dap/lldb-dap.cpp
+++ b/lldb/tools/lldb-dap/lldb-dap.cpp
@@ -61,8 +61,8 @@
#include "llvm/ADT/StringExtras.h"
#include "llvm/Option/Arg.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptTable.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/Errno.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/InitLLVM.h"
diff --git a/lldb/tools/lldb-server/LLGSOptions.td
b/lldb/tools/lldb-server/LLGSOptions.td
index 429a4671764f37..f1ba5a531a0f38 100644
--- a/lldb/tools/lldb-server/LLGSOptions.td
+++ b/lldb/tools/lldb-server/LLGSOptions.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
class F<string name>: Flag<["--", "-"], name>;
class R<list<string> prefixes, string name>
diff --git a/lldb/tools/lldb-server/lldb-gdbserver.cpp
b/lldb/tools/lldb-server/lldb-gdbserver.cpp
index d7503112697ef5..a22cc1b622b269 100644
--- a/lldb/tools/lldb-server/lldb-gdbserver.cpp
+++ b/lldb/tools/lldb-server/lldb-gdbserver.cpp
@@ -31,8 +31,8 @@
#include "lldb/Utility/Status.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptTable.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/Errno.h"
#include "llvm/Support/Error.h"
#include "llvm/Support/WithColor.h"
diff --git a/llvm/include/llvm/Option/ArgList.h
b/llvm/include/llvm/Option/ArgList.h
index 09812f976d0166..5725eaa1462ad8 100644
--- a/llvm/include/llvm/Option/ArgList.h
+++ b/llvm/include/llvm/Option/ArgList.h
@@ -11,14 +11,14 @@
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/DenseMap.h"
-#include "llvm/ADT/iterator_range.h"
#include "llvm/ADT/SmallString.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/ADT/Twine.h"
+#include "llvm/ADT/iterator_range.h"
#include "llvm/Option/Arg.h"
-#include "llvm/Option/OptSpecifier.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionSpecifier.h"
#include <algorithm>
#include <cstddef>
#include <initializer_list>
diff --git a/llvm/include/llvm/Option/Option.h
b/llvm/include/llvm/Option/Option.h
index 5d16fbdb6b77c8..76d3c237d8934d 100644
--- a/llvm/include/llvm/Option/Option.h
+++ b/llvm/include/llvm/Option/Option.h
@@ -11,8 +11,8 @@
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h"
-#include "llvm/Option/OptSpecifier.h"
-#include "llvm/Option/OptTable.h"
+#include "llvm/Option/OptionSpecifier.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/ErrorHandling.h"
#include <cassert>
diff --git a/llvm/include/llvm/Option/OptParser.td
b/llvm/include/llvm/Option/OptionParser.td
similarity index 98%
rename from llvm/include/llvm/Option/OptParser.td
rename to llvm/include/llvm/Option/OptionParser.td
index 9fd606b0d6fcb0..12cc1f92dc2f0e 100644
--- a/llvm/include/llvm/Option/OptParser.td
+++ b/llvm/include/llvm/Option/OptionParser.td
@@ -1,4 +1,4 @@
-//===--- OptParser.td - Common Option Parsing Interfaces
------------------===//
+//===--- OptionParser.td - Common Option Parsing Interfaces
---------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM
Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_OPTION_OPTPARSER_TD
-#define LLVM_OPTION_OPTPARSER_TD
+#ifndef LLVM_OPTION_OPTIONPARSER_TD
+#define LLVM_OPTION_OPTIONPARSER_TD
// Define the kinds of options.
@@ -274,4 +274,4 @@ class ValueExtractor<code extractor> { code ValueExtractor
= extractor; }
def INPUT : Option<[], "<input>", KIND_INPUT>;
def UNKNOWN : Option<[], "<unknown>", KIND_UNKNOWN>;
-#endif // LLVM_OPTION_OPTPARSER_TD
+#endif // LLVM_OPTION_OPTIONPARSER_TD
diff --git a/llvm/include/llvm/Option/OptSpecifier.h
b/llvm/include/llvm/Option/OptionSpecifier.h
similarity index 83%
rename from llvm/include/llvm/Option/OptSpecifier.h
rename to llvm/include/llvm/Option/OptionSpecifier.h
index 7a5fcfb18b3886..fa97b14596c798 100644
--- a/llvm/include/llvm/Option/OptSpecifier.h
+++ b/llvm/include/llvm/Option/OptionSpecifier.h
@@ -1,4 +1,4 @@
-//===- OptSpecifier.h - Option Specifiers -----------------------*- C++
-*-===//
+//===- OptionSpecifier.h - Option Specifiers --------------------*- C++
-*-===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM
Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_OPTION_OPTSPECIFIER_H
-#define LLVM_OPTION_OPTSPECIFIER_H
+#ifndef LLVM_OPTION_OPTIONSPECIFIER_H
+#define LLVM_OPTION_OPTIONSPECIFIER_H
namespace llvm {
namespace opt {
@@ -35,4 +35,4 @@ class OptSpecifier {
} // end namespace opt
} // end namespace llvm
-#endif // LLVM_OPTION_OPTSPECIFIER_H
+#endif // LLVM_OPTION_OPTIONSPECIFIER_H
diff --git a/llvm/include/llvm/Option/OptTable.h
b/llvm/include/llvm/Option/OptionTable.h
similarity index 97%
rename from llvm/include/llvm/Option/OptTable.h
rename to llvm/include/llvm/Option/OptionTable.h
index 8fabc78d81aedf..3fdbcb026ff831 100644
--- a/llvm/include/llvm/Option/OptTable.h
+++ b/llvm/include/llvm/Option/OptionTable.h
@@ -1,4 +1,4 @@
-//===- OptTable.h - Option Table --------------------------------*- C++
-*-===//
+//===- OptionTable.h - Option Table -----------------------------*- C++
-*-===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM
Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
@@ -6,13 +6,13 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_OPTION_OPTTABLE_H
-#define LLVM_OPTION_OPTTABLE_H
+#ifndef LLVM_OPTION_OPTIONTABLE_H
+#define LLVM_OPTION_OPTIONTABLE_H
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/SmallString.h"
#include "llvm/ADT/StringRef.h"
-#include "llvm/Option/OptSpecifier.h"
+#include "llvm/Option/OptionSpecifier.h"
#include "llvm/Support/StringSaver.h"
#include <cassert>
#include <string>
@@ -145,9 +145,7 @@ class OptTable {
}
/// Get the kind of the given option.
- unsigned getOptionKind(OptSpecifier id) const {
- return getInfo(id).Kind;
- }
+ unsigned getOptionKind(OptSpecifier id) const { return getInfo(id).Kind; }
/// Get the group id for the given option.
unsigned getOptionGroupID(OptSpecifier id) const {
@@ -329,7 +327,8 @@ class OptTable {
/// \param OS - The stream to write the help text to.
/// \param Usage - USAGE: Usage
/// \param Title - OVERVIEW: Title
- /// \param VisibilityMask - Only in Visibility
VisibilityMask,clude options with any of these
+ /// \param VisibilityMask - Only in Visibility
+ /// VisibilityMask,clude options with any of these
/// visibility flags set.
/// \param ShowHidden - If true, display options marked as HelpHidden
/// \param ShowAllAliases - If true, display all options including aliases
@@ -409,4 +408,4 @@ class PrecomputedOptTable : public OptTable {
OPT_, PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS,
\
VISIBILITY, PARAM, HELPTEXT, HELPTEXTSFORVARIANTS, METAVAR, VALUES)
-#endif // LLVM_OPTION_OPTTABLE_H
+#endif // LLVM_OPTION_OPTIONTABLE_H
diff --git a/llvm/lib/ExecutionEngine/JITLink/COFFOptions.td
b/llvm/lib/ExecutionEngine/JITLink/COFFOptions.td
index 0a0ce2fc76dde9..043e0e6a697a05 100644
--- a/llvm/lib/ExecutionEngine/JITLink/COFFOptions.td
+++ b/llvm/lib/ExecutionEngine/JITLink/COFFOptions.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
// link.exe accepts options starting with either a dash or a slash.
diff --git a/llvm/lib/Option/ArgList.cpp b/llvm/lib/Option/ArgList.cpp
index 6e164150d2e5e9..88f6e2c456a322 100644
--- a/llvm/lib/Option/ArgList.cpp
+++ b/llvm/lib/Option/ArgList.cpp
@@ -6,16 +6,16 @@
//
//===----------------------------------------------------------------------===//
+#include "llvm/Option/ArgList.h"
#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/ADT/Twine.h"
#include "llvm/Config/llvm-config.h"
#include "llvm/Option/Arg.h"
-#include "llvm/Option/ArgList.h"
#include "llvm/Option/Option.h"
-#include "llvm/Option/OptSpecifier.h"
+#include "llvm/Option/OptionSpecifier.h"
#include "llvm/Support/Compiler.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/raw_ostream.h"
diff --git a/llvm/lib/Option/CMakeLists.txt b/llvm/lib/Option/CMakeLists.txt
index dc7669c5211150..e85272419e2670 100644
--- a/llvm/lib/Option/CMakeLists.txt
+++ b/llvm/lib/Option/CMakeLists.txt
@@ -2,7 +2,7 @@ add_llvm_component_library(LLVMOption
Arg.cpp
ArgList.cpp
Option.cpp
- OptTable.cpp
+ OptionTable.cpp
ADDITIONAL_HEADER_DIRS
${LLVM_MAIN_INCLUDE_DIR}/llvm/Option
diff --git a/llvm/lib/Option/Option.cpp b/llvm/lib/Option/Option.cpp
index ecb3e84b1da8bd..8121830feef79d 100644
--- a/llvm/lib/Option/Option.cpp
+++ b/llvm/lib/Option/Option.cpp
@@ -12,7 +12,7 @@
#include "llvm/Config/llvm-config.h"
#include "llvm/Option/Arg.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptTable.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/Compiler.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/ErrorHandling.h"
diff --git a/llvm/lib/Option/OptTable.cpp b/llvm/lib/Option/OptionTable.cpp
similarity index 94%
rename from llvm/lib/Option/OptTable.cpp
rename to llvm/lib/Option/OptionTable.cpp
index 9fdafed39b8b6c..195f94b15de590 100644
--- a/llvm/lib/Option/OptTable.cpp
+++ b/llvm/lib/Option/OptionTable.cpp
@@ -1,4 +1,4 @@
-//===- OptTable.cpp - Option Table Implementation
-------------------------===//
+//===- OptionTable.cpp - Option Table Implementation
----------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM
Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
@@ -6,13 +6,13 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/Option/OptTable.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Option/Arg.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptSpecifier.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionSpecifier.h"
#include "llvm/Support/CommandLine.h" // for expandResponseFiles
#include "llvm/Support/Compiler.h"
#include "llvm/Support/ErrorHandling.h"
@@ -94,14 +94,15 @@ OptTable::OptTable(ArrayRef<Info> OptionInfos, bool
IgnoreCase)
// Check that everything after the first searchable option is a
// regular option class.
for (unsigned i = FirstSearchableIndex, e = getNumOptions(); i != e; ++i) {
- Option::OptionClass Kind = (Option::OptionClass) getInfo(i + 1).Kind;
+ Option::OptionClass Kind = (Option::OptionClass)getInfo(i + 1).Kind;
assert((Kind != Option::InputClass && Kind != Option::UnknownClass &&
Kind != Option::GroupClass) &&
"Special options should be defined first!");
}
// Check that options are in order.
- for (unsigned i = FirstSearchableIndex + 1, e = getNumOptions(); i != e;
++i){
+ for (unsigned i = FirstSearchableIndex + 1, e = getNumOptions(); i != e;
+ ++i) {
if (!(getInfo(i) < getInfo(i + 1))) {
getOption(i).dump();
getOption(i + 1).dump();
@@ -128,7 +129,7 @@ const Option OptTable::getOption(OptSpecifier Opt) const {
unsigned id = Opt.getID();
if (id == 0)
return Option(nullptr, nullptr);
- assert((unsigned) (id - 1) < getNumOptions() && "Invalid ID.");
+ assert((unsigned)(id - 1) < getNumOptions() && "Invalid ID.");
return Option(&getInfo(id), this);
}
@@ -475,11 +476,10 @@ InputArgList OptTable::ParseArgs(ArrayRef<const char *>
Args,
unsigned &MissingArgIndex,
unsigned &MissingArgCount,
Visibility VisibilityMask) const {
- return internalParseArgs(
- Args, MissingArgIndex, MissingArgCount,
- [VisibilityMask](const Option &Opt) {
- return !Opt.hasVisibilityFlag(VisibilityMask);
- });
+ return internalParseArgs(Args, MissingArgIndex, MissingArgCount,
+ [VisibilityMask](const Option &Opt) {
+ return !Opt.hasVisibilityFlag(VisibilityMask);
+ });
}
InputArgList OptTable::ParseArgs(ArrayRef<const char *> Args,
@@ -487,15 +487,14 @@ InputArgList OptTable::ParseArgs(ArrayRef<const char *>
Args,
unsigned &MissingArgCount,
unsigned FlagsToInclude,
unsigned FlagsToExclude) const {
- return internalParseArgs(
- Args, MissingArgIndex, MissingArgCount,
- [FlagsToInclude, FlagsToExclude](const Option &Opt) {
- if (FlagsToInclude && !Opt.hasFlag(FlagsToInclude))
- return true;
- if (Opt.hasFlag(FlagsToExclude))
- return true;
- return false;
- });
+ return internalParseArgs(Args, MissingArgIndex, MissingArgCount,
+ [FlagsToInclude, FlagsToExclude](const Option &Opt)
{
+ if (FlagsToInclude &&
!Opt.hasFlag(FlagsToInclude))
+ return true;
+ if (Opt.hasFlag(FlagsToExclude))
+ return true;
+ return false;
+ });
}
InputArgList OptTable::internalParseArgs(
@@ -532,9 +531,9 @@ InputArgList OptTable::internalParseArgs(
}
unsigned Prev = Index;
- std::unique_ptr<Arg> A = GroupedShortOptions
- ? parseOneArgGrouped(Args, Index)
- : internalParseOneArg(Args, Index, ExcludeOption);
+ std::unique_ptr<Arg> A =
+ GroupedShortOptions ? parseOneArgGrouped(Args, Index)
+ : internalParseOneArg(Args, Index, ExcludeOption);
assert((Index > Prev || GroupedShortOptions) &&
"Parser failed to consume argument.");
@@ -586,7 +585,9 @@ static std::string getOptionHelpName(const OptTable &Opts,
OptSpecifier Id) {
// Add metavar, if used.
switch (O.getKind()) {
- case Option::GroupClass: case Option::InputClass: case Option::UnknownClass:
+ case Option::GroupClass:
+ case Option::InputClass:
+ case Option::UnknownClass:
llvm_unreachable("Invalid option with help text.");
case Option::MultiArgClass:
@@ -594,10 +595,9 @@ static std::string getOptionHelpName(const OptTable &Opts,
OptSpecifier Id) {
// For MultiArgs, metavar is full list of all argument names.
Name += ' ';
Name += MetaVarName;
- }
- else {
+ } else {
// For MultiArgs<N>, if metavar not supplied, print <value> N times.
- for (unsigned i=0, e=O.getNumArgs(); i< e; ++i) {
+ for (unsigned i = 0, e = O.getNumArgs(); i < e; ++i) {
Name += " <value>";
}
}
@@ -609,11 +609,14 @@ static std::string getOptionHelpName(const OptTable
&Opts, OptSpecifier Id) {
case Option::ValuesClass:
break;
- case Option::SeparateClass: case Option::JoinedOrSeparateClass:
- case Option::RemainingArgsClass: case Option::RemainingArgsJoinedClass:
+ case Option::SeparateClass:
+ case Option::JoinedOrSeparateClass:
+ case Option::RemainingArgsClass:
+ case Option::RemainingArgsJoinedClass:
Name += ' ';
[[fallthrough]];
- case Option::JoinedClass: case Option::CommaJoinedClass:
+ case Option::JoinedClass:
+ case Option::CommaJoinedClass:
case Option::JoinedAndSeparateClass:
if (const char *MetaVarName = Opts.getOptionMetaVar(Id))
Name += MetaVarName;
@@ -754,7 +757,7 @@ void OptTable::internalPrintHelp(
}
}
- for (auto& OptionGroup : GroupedOptionHelp) {
+ for (auto &OptionGroup : GroupedOptionHelp) {
if (OptionGroup.first != GroupedOptionHelp.begin()->first)
OS << "\n";
PrintHelpOptionList(OS, OptionGroup.first, OptionGroup.second);
diff --git a/llvm/lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp
b/llvm/lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp
index 15e4cac08cd4ed..5f501f66e7c8e3 100644
--- a/llvm/lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp
+++ b/llvm/lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp
@@ -17,8 +17,8 @@
#include "llvm/Object/COFFModuleDefinition.h"
#include "llvm/Option/Arg.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptTable.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/Path.h"
#include "llvm/TargetParser/Host.h"
diff --git a/llvm/lib/ToolDrivers/llvm-dlltool/Options.td
b/llvm/lib/ToolDrivers/llvm-dlltool/Options.td
index 7810694c98e363..1984be7615d556 100644
--- a/llvm/lib/ToolDrivers/llvm-dlltool/Options.td
+++ b/llvm/lib/ToolDrivers/llvm-dlltool/Options.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
def m: JoinedOrSeparate<["-"], "m">, HelpText<"Set target machine">;
def m_long : JoinedOrSeparate<["--"], "machine">, Alias<m>;
diff --git a/llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp
b/llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp
index 07389a5ffb2b8a..54741347047970 100644
--- a/llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp
+++ b/llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp
@@ -23,8 +23,8 @@
#include "llvm/Object/WindowsMachineFlag.h"
#include "llvm/Option/Arg.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptTable.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/Process.h"
diff --git a/llvm/lib/ToolDrivers/llvm-lib/Options.td
b/llvm/lib/ToolDrivers/llvm-lib/Options.td
index a3d901d77054a4..541668c4d09143 100644
--- a/llvm/lib/ToolDrivers/llvm-lib/Options.td
+++ b/llvm/lib/ToolDrivers/llvm-lib/Options.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
// lib.exe accepts options starting with either a dash or a slash.
diff --git a/llvm/tools/dsymutil/Options.td b/llvm/tools/dsymutil/Options.td
index 67d367565764f4..cf8e2d87a60d8c 100644
--- a/llvm/tools/dsymutil/Options.td
+++ b/llvm/tools/dsymutil/Options.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
class F<string name>: Flag<["--", "-"], name>;
diff --git a/llvm/tools/llvm-cgdata/Opts.td b/llvm/tools/llvm-cgdata/Opts.td
index b2cfc6a85bbd32..9eaa440aaeeea9 100644
--- a/llvm/tools/llvm-cgdata/Opts.td
+++ b/llvm/tools/llvm-cgdata/Opts.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
class F<string letter, string help> : Flag<["-"], letter>, HelpText<help>;
class FF<string name, string help> : Flag<["--"], name>, HelpText<help>;
diff --git a/llvm/tools/llvm-cvtres/Opts.td b/llvm/tools/llvm-cvtres/Opts.td
index 21d583787cd587..1be781a6eed099 100644
--- a/llvm/tools/llvm-cvtres/Opts.td
+++ b/llvm/tools/llvm-cvtres/Opts.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
// All the switches can be preceded by either '/' or '-'.
diff --git a/llvm/tools/llvm-cxxfilt/Opts.td b/llvm/tools/llvm-cxxfilt/Opts.td
index 034cb267aab800..34207c4aaecbbd 100644
--- a/llvm/tools/llvm-cxxfilt/Opts.td
+++ b/llvm/tools/llvm-cxxfilt/Opts.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
class F<string letter, string help> : Flag<["-"], letter>, HelpText<help>;
class FF<string name, string help> : Flag<["--"], name>, HelpText<help>;
diff --git a/llvm/tools/llvm-debuginfod-find/Opts.td
b/llvm/tools/llvm-debuginfod-find/Opts.td
index a770f50d241a29..73c57f0fe870d2 100644
--- a/llvm/tools/llvm-debuginfod-find/Opts.td
+++ b/llvm/tools/llvm-debuginfod-find/Opts.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
class F<string name, string help> : Flag<["-"], name>, HelpText<help>;
class FF<string name, string help>: Flag<["--"], name>, HelpText<help>;
diff --git a/llvm/tools/llvm-debuginfod/Opts.td
b/llvm/tools/llvm-debuginfod/Opts.td
index 1de241a3fc2a1e..ca8fa7ec866e6e 100644
--- a/llvm/tools/llvm-debuginfod/Opts.td
+++ b/llvm/tools/llvm-debuginfod/Opts.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
class F<string name, string help> : Flag<["-"], name>, HelpText<help>;
class FF<string name, string help>: Flag<["--"], name>, HelpText<help>;
diff --git a/llvm/tools/llvm-dwarfutil/Options.td
b/llvm/tools/llvm-dwarfutil/Options.td
index 85606bd4d58dd5..06f65ae20b3794 100644
--- a/llvm/tools/llvm-dwarfutil/Options.td
+++ b/llvm/tools/llvm-dwarfutil/Options.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
multiclass BB<string name, string help1, string help2> {
def NAME: Flag<["--"], name>, HelpText<help1>;
diff --git a/llvm/tools/llvm-dwp/Opts.td b/llvm/tools/llvm-dwp/Opts.td
index 46593bc40ebae8..cdb621aca99959 100644
--- a/llvm/tools/llvm-dwp/Opts.td
+++ b/llvm/tools/llvm-dwp/Opts.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
class F<string name, string help> : Flag<["-", "--"], name>, HelpText<help>;
class S<string name, string help> : Separate<["-", "--"], name>,
HelpText<help>;
diff --git a/llvm/tools/llvm-gsymutil/Opts.td b/llvm/tools/llvm-gsymutil/Opts.td
index e3001f3fe53f1d..23101507089100 100644
--- a/llvm/tools/llvm-gsymutil/Opts.td
+++ b/llvm/tools/llvm-gsymutil/Opts.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
class F<string letter, string help> : Flag<["-"], letter>, HelpText<help>;
class FF<string name, string help> : Flag<["--"], name>, HelpText<help>;
diff --git a/llvm/tools/llvm-ifs/Opts.td b/llvm/tools/llvm-ifs/Opts.td
index 7288cf0123a726..fc841be34ac958 100644
--- a/llvm/tools/llvm-ifs/Opts.td
+++ b/llvm/tools/llvm-ifs/Opts.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
class F<string letter, string help> : Flag<["-"], letter>, HelpText<help>;
class FF<string name, string help> : Flag<["--"], name>, HelpText<help>;
diff --git a/llvm/tools/llvm-libtool-darwin/Opts.td
b/llvm/tools/llvm-libtool-darwin/Opts.td
index fc9a7e66bc76c9..e29a15d41fe524 100644
--- a/llvm/tools/llvm-libtool-darwin/Opts.td
+++ b/llvm/tools/llvm-libtool-darwin/Opts.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
class F<string letter, string help> : Flag<["-", "--"], letter>,
HelpText<help>;
class FF<string name, string help> : Flag<["-", "--"], name>, HelpText<help>;
diff --git a/llvm/tools/llvm-lipo/LipoOpts.td b/llvm/tools/llvm-lipo/LipoOpts.td
index 32bdca4a5da160..bed0b6117a6581 100644
--- a/llvm/tools/llvm-lipo/LipoOpts.td
+++ b/llvm/tools/llvm-lipo/LipoOpts.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
def help : Flag<["-", "--"], "help">;
def h : Flag<["-"], "h">, Alias<help>;
diff --git a/llvm/tools/llvm-ml/Opts.td b/llvm/tools/llvm-ml/Opts.td
index 8b748bb64b278b..0c1b9404e7c910 100644
--- a/llvm/tools/llvm-ml/Opts.td
+++ b/llvm/tools/llvm-ml/Opts.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
// For LLVM-specific options, we prefer a two-dash prefix, but accept one for
// compatibility with llvm-mc. For clear separation from ML.EXE compatible
diff --git a/llvm/tools/llvm-mt/Opts.td b/llvm/tools/llvm-mt/Opts.td
index c4f7375c6d8fa7..9df82ccd2c05f8 100644
--- a/llvm/tools/llvm-mt/Opts.td
+++ b/llvm/tools/llvm-mt/Opts.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
def unsupported : OptionGroup<"unsupported">;
def manifest : Separate<["/", "-"], "manifest">, HelpText<"Used to specify
each manifest that need to be processed">, MetaVarName<"manifest">;
diff --git a/llvm/tools/llvm-nm/Opts.td b/llvm/tools/llvm-nm/Opts.td
index 04d9f5db5cf85d..bc72e7f561dc93 100644
--- a/llvm/tools/llvm-nm/Opts.td
+++ b/llvm/tools/llvm-nm/Opts.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
class F<string letter, string help> : Flag<["-"], letter>, HelpText<help>;
class FF<string name, string help> : Flag<["--"], name>, HelpText<help>;
diff --git a/llvm/tools/llvm-objcopy/BitcodeStripOpts.td
b/llvm/tools/llvm-objcopy/BitcodeStripOpts.td
index 21db854b1e6fea..3bcf019a32d947 100644
--- a/llvm/tools/llvm-objcopy/BitcodeStripOpts.td
+++ b/llvm/tools/llvm-objcopy/BitcodeStripOpts.td
@@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
def help : Flag<["--"], "help">;
diff --git a/llvm/tools/llvm-objcopy/CommonOpts.td
b/llvm/tools/llvm-objcopy/CommonOpts.td
index c247c93f6e0f27..8606865e4ec1be 100644
--- a/llvm/tools/llvm-objcopy/CommonOpts.td
+++ b/llvm/tools/llvm-objcopy/CommonOpts.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
multiclass Eq<string name, string help> {
def NAME : Separate<["--"], name>;
diff --git a/llvm/tools/llvm-objcopy/InstallNameToolOpts.td
b/llvm/tools/llvm-objcopy/InstallNameToolOpts.td
index 88dea84400fb9b..a0580e8f7e2c92 100644
--- a/llvm/tools/llvm-objcopy/InstallNameToolOpts.td
+++ b/llvm/tools/llvm-objcopy/InstallNameToolOpts.td
@@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
def help : Flag<["--"], "help">;
def h : Flag<["-"], "h">, Alias<help>;
diff --git a/llvm/tools/llvm-objdump/ObjdumpOptID.h
b/llvm/tools/llvm-objdump/ObjdumpOptID.h
index fc90cb5c8f0408..e1d174d124e918 100644
--- a/llvm/tools/llvm-objdump/ObjdumpOptID.h
+++ b/llvm/tools/llvm-objdump/ObjdumpOptID.h
@@ -1,7 +1,7 @@
#ifndef LLVM_TOOLS_LLVM_OBJDUMP_OBJDUMP_OPT_ID_H
#define LLVM_TOOLS_LLVM_OBJDUMP_OBJDUMP_OPT_ID_H
-#include "llvm/Option/OptTable.h"
+#include "llvm/Option/OptionTable.h"
enum ObjdumpOptID {
OBJDUMP_INVALID = 0, // This is not an option ID.
diff --git a/llvm/tools/llvm-objdump/ObjdumpOpts.td
b/llvm/tools/llvm-objdump/ObjdumpOpts.td
index c3764c6e97534a..0eb6f51a1e6c02 100644
--- a/llvm/tools/llvm-objdump/ObjdumpOpts.td
+++ b/llvm/tools/llvm-objdump/ObjdumpOpts.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
multiclass B<string name, string help1, string help2> {
def NAME: Flag<["--"], name>, HelpText<help1>;
diff --git a/llvm/tools/llvm-objdump/OtoolOpts.td
b/llvm/tools/llvm-objdump/OtoolOpts.td
index dc7a5b445cffe8..997a2ce54a5d35 100644
--- a/llvm/tools/llvm-objdump/OtoolOpts.td
+++ b/llvm/tools/llvm-objdump/OtoolOpts.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
def help : Flag<["--"], "help">, HelpText<"print help">;
def help_hidden : Flag<["--"], "help-hidden">,
diff --git a/llvm/tools/llvm-rc/Opts.td b/llvm/tools/llvm-rc/Opts.td
index 6d9c0e2601a46f..351fad1b4cb7ae 100644
--- a/llvm/tools/llvm-rc/Opts.td
+++ b/llvm/tools/llvm-rc/Opts.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
// All the switches can be preceded by either '/' or '-'.
// These options seem to be important for the tool
diff --git a/llvm/tools/llvm-rc/WindresOpts.td
b/llvm/tools/llvm-rc/WindresOpts.td
index 42a56dbfda4cd8..991606b7bc5c0a 100644
--- a/llvm/tools/llvm-rc/WindresOpts.td
+++ b/llvm/tools/llvm-rc/WindresOpts.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
multiclass Long<string name, string help> {
def NAME: Separate<["--"], name>;
diff --git a/llvm/tools/llvm-rc/llvm-rc.cpp b/llvm/tools/llvm-rc/llvm-rc.cpp
index 4bc9d90095575b..34595f984345c0 100644
--- a/llvm/tools/llvm-rc/llvm-rc.cpp
+++ b/llvm/tools/llvm-rc/llvm-rc.cpp
@@ -21,7 +21,7 @@
#include "llvm/Object/WindowsResource.h"
#include "llvm/Option/Arg.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptTable.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/Error.h"
#include "llvm/Support/FileSystem.h"
diff --git a/llvm/tools/llvm-readobj/Opts.td b/llvm/tools/llvm-readobj/Opts.td
index 7d574d875d22ea..9ac9fc3d6694c6 100644
--- a/llvm/tools/llvm-readobj/Opts.td
+++ b/llvm/tools/llvm-readobj/Opts.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
class F<string letter, string help> : Flag<["-"], letter>, HelpText<help>;
class FF<string name, string help> : Flag<["--"], name>, HelpText<help>;
diff --git a/llvm/tools/llvm-readtapi/TapiOpts.td
b/llvm/tools/llvm-readtapi/TapiOpts.td
index 3b8f26579bd4af..bb555c7a6707b9 100644
--- a/llvm/tools/llvm-readtapi/TapiOpts.td
+++ b/llvm/tools/llvm-readtapi/TapiOpts.td
@@ -1,5 +1,5 @@
// Include the common option parsing interfaces.
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
class FF<string name, string help>: Flag<["-", "--"], name>, HelpText<help>;
multiclass JS<string name, string help, string var = ""> {
diff --git a/llvm/tools/llvm-size/Opts.td b/llvm/tools/llvm-size/Opts.td
index edae43f1abd248..d0f3f4011cd9cd 100644
--- a/llvm/tools/llvm-size/Opts.td
+++ b/llvm/tools/llvm-size/Opts.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
class F<string letter, string help> : Flag<["-"], letter>, HelpText<help>;
class FF<string name, string help> : Flag<["--"], name>, HelpText<help>;
diff --git a/llvm/tools/llvm-strings/Opts.td b/llvm/tools/llvm-strings/Opts.td
index 2ad77fae6c15ff..111a946cf2987f 100644
--- a/llvm/tools/llvm-strings/Opts.td
+++ b/llvm/tools/llvm-strings/Opts.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
class F<string letter, string help> : Flag<["-"], letter>, HelpText<help>;
class FF<string name, string help> : Flag<["--"], name>, HelpText<help>;
diff --git a/llvm/tools/llvm-symbolizer/Opts.td
b/llvm/tools/llvm-symbolizer/Opts.td
index d0b227af9db464..04e0ff01810555 100644
--- a/llvm/tools/llvm-symbolizer/Opts.td
+++ b/llvm/tools/llvm-symbolizer/Opts.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
multiclass B<string name, string help1, string help2> {
def NAME: Flag<["--"], name>, HelpText<help1>;
diff --git a/llvm/tools/llvm-tli-checker/Opts.td
b/llvm/tools/llvm-tli-checker/Opts.td
index b1acef4093c458..4926bcd036aaa5 100644
--- a/llvm/tools/llvm-tli-checker/Opts.td
+++ b/llvm/tools/llvm-tli-checker/Opts.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
class F<string name, string help> : Flag<["--"], name>, HelpText<help>;
multiclass Eq<string name, string metavar, string help> {
diff --git a/llvm/tools/sancov/Opts.td b/llvm/tools/sancov/Opts.td
index 2e8af81b2a40d3..9e53898bed1b63 100644
--- a/llvm/tools/sancov/Opts.td
+++ b/llvm/tools/sancov/Opts.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
class F<string name, string help> : Flag<["-", "--"], name>, HelpText<help>;
diff --git a/llvm/unittests/Option/OptionParsingTest.cpp
b/llvm/unittests/Option/OptionParsingTest.cpp
index cd8743e49d4fde..050f94aea8dcdc 100644
--- a/llvm/unittests/Option/OptionParsingTest.cpp
+++ b/llvm/unittests/Option/OptionParsingTest.cpp
@@ -9,8 +9,8 @@
#include "llvm/ADT/STLExtras.h"
#include "llvm/Option/Arg.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptTable.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionTable.h"
#include "gtest/gtest.h"
using namespace llvm;
diff --git a/llvm/unittests/Option/Opts.td b/llvm/unittests/Option/Opts.td
index 5be67c9decdbcd..e9aa35e6f623e0 100644
--- a/llvm/unittests/Option/Opts.td
+++ b/llvm/unittests/Option/Opts.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
def OptFlag1 : OptionFlag;
def OptFlag2 : OptionFlag;
diff --git a/llvm/utils/TableGen/Common/CMakeLists.txt
b/llvm/utils/TableGen/Common/CMakeLists.txt
index 7342156980f35f..81eee9d3f04d33 100644
--- a/llvm/utils/TableGen/Common/CMakeLists.txt
+++ b/llvm/utils/TableGen/Common/CMakeLists.txt
@@ -29,7 +29,7 @@ add_llvm_library(LLVMTableGenCommon STATIC OBJECT
EXCLUDE_FROM_ALL DISABLE_LLVM_
CodeGenTarget.cpp
DAGISelMatcher.cpp
InfoByHwMode.cpp
- OptEmitter.cpp
+ OptionEmitter.cpp
PredicateExpander.cpp
SubtargetFeatureInfo.cpp
Types.cpp
diff --git a/llvm/utils/TableGen/Common/OptEmitter.cpp
b/llvm/utils/TableGen/Common/OptionEmitter.cpp
similarity index 95%
rename from llvm/utils/TableGen/Common/OptEmitter.cpp
rename to llvm/utils/TableGen/Common/OptionEmitter.cpp
index f914909ebe5e48..6527e1bbdf8e52 100644
--- a/llvm/utils/TableGen/Common/OptEmitter.cpp
+++ b/llvm/utils/TableGen/Common/OptionEmitter.cpp
@@ -1,4 +1,4 @@
-//===- OptEmitter.cpp - Helper for emitting options -------------*- C++
-*-===//
+//===- OptionEmitter.cpp - Helper for emitting options ----------*- C++
-*-===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM
Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "OptEmitter.h"
+#include "OptionEmitter.h"
#include "llvm/ADT/Twine.h"
#include "llvm/Support/OptionStrCmp.h"
#include "llvm/TableGen/Error.h"
diff --git a/llvm/utils/TableGen/Common/OptEmitter.h
b/llvm/utils/TableGen/Common/OptionEmitter.h
similarity index 68%
rename from llvm/utils/TableGen/Common/OptEmitter.h
rename to llvm/utils/TableGen/Common/OptionEmitter.h
index f7ffa0bcc4a975..5d9fd7cf53913c 100644
--- a/llvm/utils/TableGen/Common/OptEmitter.h
+++ b/llvm/utils/TableGen/Common/OptionEmitter.h
@@ -1,4 +1,4 @@
-//===- OptEmitter.h - Helper for emitting options ---------------*- C++
-*-===//
+//===- OptionEmitter.h - Helper for emitting options ------------*- C++
-*-===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM
Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_UTILS_TABLEGEN_COMMON_OPTEMITTER_H
-#define LLVM_UTILS_TABLEGEN_COMMON_OPTEMITTER_H
+#ifndef LLVM_UTILS_TABLEGEN_COMMON_OPTIONEMITTER_H
+#define LLVM_UTILS_TABLEGEN_COMMON_OPTIONEMITTER_H
namespace llvm {
class Record;
@@ -15,4 +15,4 @@ class Record;
bool IsOptionRecordsLess(const Record *A, const Record *B);
} // namespace llvm
-#endif // LLVM_UTILS_TABLEGEN_COMMON_OPTEMITTER_H
+#endif // LLVM_UTILS_TABLEGEN_COMMON_OPTIONEMITTER_H
diff --git a/llvm/utils/TableGen/OptionParserEmitter.cpp
b/llvm/utils/TableGen/OptionParserEmitter.cpp
index 424cf16e719d5d..e4f3a5f2d4d14f 100644
--- a/llvm/utils/TableGen/OptionParserEmitter.cpp
+++ b/llvm/utils/TableGen/OptionParserEmitter.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "Common/OptEmitter.h"
+#include "Common/OptionEmitter.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/SmallString.h"
#include "llvm/ADT/Twine.h"
diff --git a/llvm/utils/TableGen/OptionRSTEmitter.cpp
b/llvm/utils/TableGen/OptionRSTEmitter.cpp
index 1b4c4cad4f0a45..4f60a046aa07d2 100644
--- a/llvm/utils/TableGen/OptionRSTEmitter.cpp
+++ b/llvm/utils/TableGen/OptionRSTEmitter.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "Common/OptEmitter.h"
+#include "Common/OptionEmitter.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/StringMap.h"
#include "llvm/TableGen/Record.h"
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
