[NFC] Rename Option parsing related files from OptXYZ -> OptionXYZ

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"

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"

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:
 

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 {
 

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 {

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.

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"

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"

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;

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"

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"

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"

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"

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"

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"

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"
 
 
 /////////

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"

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;

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"

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;
 

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>;

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"

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"

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"

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"

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"
 

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>

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.
 

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

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>
 

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>;

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>;

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

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>;

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>;

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"

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>

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"

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>

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>
 

llvm/include/llvm/Option/OptParser.td → 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