Skip to content

Commit 3bc51b7

Browse files
PrabhukPrabhuk
committed
Update macro definition variable names
1 parent e28d2b0 commit 3bc51b7

File tree

9 files changed

+19
-19
lines changed

9 files changed

+19
-19
lines changed

‎clang-tools-extra/clangd/CompileCommands.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ llvm::ArrayRef<ArgStripper::Rule> ArgStripper::rulesFor(llvm::StringRef Arg) {
465465
} AliasTable[] = {
466466
#define OPTION(PREFIX, PREFIXED_NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, \
467467
FLAGS, VISIBILITY, PARAM, HELPTEXT, HELPTEXTSFORVARIANTS, \
468-
METAVAR, VALUES, COMMANDIDS_OFFSET) \
468+
METAVAR, VALUES, SUBCOMMANDIDS_OFFSET) \
469469
{DriverID::OPT_##ID, DriverID::OPT_##ALIAS, ALIASARGS},
470470
#include "clang/Driver/Options.inc"
471471
#undef OPTION

‎clang/lib/Frontend/CompilerInvocation.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ static T extractMaskValue(T KeyPath) {
533533
#define PARSE_OPTION_WITH_MARSHALLING( \
534534
ARGS, DIAGS, PREFIX_TYPE, SPELLING_OFFSET, ID, KIND, GROUP, ALIAS, \
535535
ALIASARGS, FLAGS, VISIBILITY, PARAM, HELPTEXT, HELPTEXTSFORVARIANTS, \
536-
METAVAR, VALUES, COMMANDIDS_OFFSET, SHOULD_PARSE, ALWAYS_EMIT, KEYPATH, \
536+
METAVAR, VALUES, SUBCOMMANDIDS_OFFSET, SHOULD_PARSE, ALWAYS_EMIT, KEYPATH, \
537537
DEFAULT_VALUE, IMPLIED_CHECK, IMPLIED_VALUE, NORMALIZER, DENORMALIZER, \
538538
MERGER, EXTRACTOR, TABLE_INDEX) \
539539
if ((VISIBILITY) & options::CC1Option) { \
@@ -551,7 +551,7 @@ static T extractMaskValue(T KeyPath) {
551551
#define GENERATE_OPTION_WITH_MARSHALLING( \
552552
CONSUMER, PREFIX_TYPE, SPELLING_OFFSET, ID, KIND, GROUP, ALIAS, ALIASARGS, \
553553
FLAGS, VISIBILITY, PARAM, HELPTEXT, HELPTEXTSFORVARIANTS, METAVAR, VALUES, \
554-
COMMANDIDS_OFFSET, SHOULD_PARSE, ALWAYS_EMIT, KEYPATH, DEFAULT_VALUE, \
554+
SUBCOMMANDIDS_OFFSET, SHOULD_PARSE, ALWAYS_EMIT, KEYPATH, DEFAULT_VALUE, \
555555
IMPLIED_CHECK, IMPLIED_VALUE, NORMALIZER, DENORMALIZER, MERGER, EXTRACTOR, \
556556
TABLE_INDEX) \
557557
if ((VISIBILITY) & options::CC1Option) { \

‎clang/tools/clang-installapi/Options.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ enum ID {
208208
OPT_INVALID = 0, // This is not an option ID.
209209
#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, \
210210
VISIBILITY, PARAM, HELPTEXT, HELPTEXTSFORVARIANTS, METAVAR, \
211-
VALUES, COMMANDIDS_OFFSET) \
211+
VALUES, SUBCOMMANDIDS_OFFSET) \
212212
OPT_##ID,
213213
#include "InstallAPIOpts.inc"
214214
LastOption

‎lld/MachO/DriverUtils.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ using namespace lld::macho;
4545
static constexpr OptTable::Info optInfo[] = {
4646
#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, \
4747
VISIBILITY, PARAM, HELPTEXT, HELPTEXTSFORVARIANTS, METAVAR, \
48-
VALUES, COMMANDIDS_OFFSET) \
48+
VALUES, SUBCOMMANDIDS_OFFSET) \
4949
{PREFIX, \
5050
NAME, \
5151
HELPTEXT, \
@@ -60,7 +60,7 @@ static constexpr OptTable::Info optInfo[] = {
6060
OPT_##ALIAS, \
6161
ALIASARGS, \
6262
VALUES, \
63-
COMMANDIDS_OFFSET},
63+
SUBCOMMANDIDS_OFFSET},
6464
#include "Options.inc"
6565
#undef OPTION
6666
};

‎lld/MinGW/Driver.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ enum {
6969
static constexpr opt::OptTable::Info infoTable[] = {
7070
#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, \
7171
VISIBILITY, PARAM, HELPTEXT, HELPTEXTSFORVARIANTS, METAVAR, \
72-
VALUES, COMMANDIDS_OFFSET) \
72+
VALUES, SUBCOMMANDIDS_OFFSET) \
7373
{PREFIX, \
7474
NAME, \
7575
HELPTEXT, \
@@ -84,7 +84,7 @@ static constexpr opt::OptTable::Info infoTable[] = {
8484
OPT_##ALIAS, \
8585
ALIASARGS, \
8686
VALUES, \
87-
COMMANDIDS_OFFSET},
87+
SUBCOMMANDIDS_OFFSET},
8888
#include "Options.inc"
8989
#undef OPTION
9090
};

‎lld/wasm/Driver.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ bool link(ArrayRef<const char *> args, llvm::raw_ostream &stdoutOS,
157157
static constexpr opt::OptTable::Info optInfo[] = {
158158
#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, \
159159
VISIBILITY, PARAM, HELPTEXT, HELPTEXTSFORVARIANTS, METAVAR, \
160-
VALUES, COMMANDIDS_OFFSET) \
160+
VALUES, SUBCOMMANDIDS_OFFSET) \
161161
{PREFIX, \
162162
NAME, \
163163
HELPTEXT, \
@@ -172,7 +172,7 @@ static constexpr opt::OptTable::Info optInfo[] = {
172172
OPT_##ALIAS, \
173173
ALIASARGS, \
174174
VALUES, \
175-
COMMANDIDS_OFFSET},
175+
SUBCOMMANDIDS_OFFSET},
176176
#include "Options.inc"
177177
#undef OPTION
178178
};

‎llvm/examples/OptSubcommand/llvm-hello-sub.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ enum ID {
1414
OPT_INVALID = 0,
1515
#define OPTION(PREFIXES, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, \
1616
VISIBILITY, PARAM, HELPTEXT, HELPTEXTSFORVARIANTS, METAVAR, \
17-
VALUES, COMMANDIDS_OFFSET) \
17+
VALUES, SUBCOMMANDIDS_OFFSET) \
1818
OPT_##ID,
1919
#include "Opts.inc"
2020
#undef OPTION

‎llvm/include/llvm/Option/OptTable.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -494,36 +494,36 @@ class PrecomputedOptTable : public OptTable {
494494
#define LLVM_MAKE_OPT_ID_WITH_ID_PREFIX( \
495495
ID_PREFIX, PREFIXES_OFFSET, PREFIXED_NAME_OFFSET, ID, KIND, GROUP, ALIAS, \
496496
ALIASARGS, FLAGS, VISIBILITY, PARAM, HELPTEXT, HELPTEXTSFORVARIANTS, \
497-
METAVAR, VALUES, COMMANDIDS_OFFSET) \
497+
METAVAR, VALUES, SUBCOMMANDIDS_OFFSET) \
498498
ID_PREFIX##ID
499499

500500
#define LLVM_MAKE_OPT_ID(PREFIXES_OFFSET, PREFIXED_NAME_OFFSET, ID, KIND, \
501501
GROUP, ALIAS, ALIASARGS, FLAGS, VISIBILITY, PARAM, \
502502
HELPTEXT, HELPTEXTSFORVARIANTS, METAVAR, VALUES, \
503-
COMMANDIDS_OFFSET) \
503+
SUBCOMMANDIDS_OFFSET) \
504504
LLVM_MAKE_OPT_ID_WITH_ID_PREFIX( \
505505
OPT_, PREFIXES_OFFSET, PREFIXED_NAME_OFFSET, ID, KIND, GROUP, ALIAS, \
506506
ALIASARGS, FLAGS, VISIBILITY, PARAM, HELPTEXT, HELPTEXTSFORVARIANTS, \
507-
METAVAR, VALUES, COMMANDIDS_OFFSET)
507+
METAVAR, VALUES, SUBCOMMANDIDS_OFFSET)
508508

509509
#define LLVM_CONSTRUCT_OPT_INFO_WITH_ID_PREFIX( \
510510
ID_PREFIX, PREFIXES_OFFSET, PREFIXED_NAME_OFFSET, ID, KIND, GROUP, ALIAS, \
511511
ALIASARGS, FLAGS, VISIBILITY, PARAM, HELPTEXT, HELPTEXTSFORVARIANTS, \
512-
METAVAR, VALUES, COMMANDIDS_OFFSET) \
512+
METAVAR, VALUES, SUBCOMMANDIDS_OFFSET) \
513513
llvm::opt::OptTable::Info { \
514514
PREFIXES_OFFSET, PREFIXED_NAME_OFFSET, HELPTEXT, HELPTEXTSFORVARIANTS, \
515515
METAVAR, ID_PREFIX##ID, llvm::opt::Option::KIND##Class, PARAM, FLAGS, \
516516
VISIBILITY, ID_PREFIX##GROUP, ID_PREFIX##ALIAS, ALIASARGS, VALUES, \
517-
COMMANDIDS_OFFSET \
517+
SUBCOMMANDIDS_OFFSET \
518518
}
519519

520520
#define LLVM_CONSTRUCT_OPT_INFO( \
521521
PREFIXES_OFFSET, PREFIXED_NAME_OFFSET, ID, KIND, GROUP, ALIAS, ALIASARGS, \
522522
FLAGS, VISIBILITY, PARAM, HELPTEXT, HELPTEXTSFORVARIANTS, METAVAR, VALUES, \
523-
COMMANDIDS_OFFSET) \
523+
SUBCOMMANDIDS_OFFSET) \
524524
LLVM_CONSTRUCT_OPT_INFO_WITH_ID_PREFIX( \
525525
OPT_, PREFIXES_OFFSET, PREFIXED_NAME_OFFSET, ID, KIND, GROUP, ALIAS, \
526526
ALIASARGS, FLAGS, VISIBILITY, PARAM, HELPTEXT, HELPTEXTSFORVARIANTS, \
527-
METAVAR, VALUES, COMMANDIDS_OFFSET)
527+
METAVAR, VALUES, SUBCOMMANDIDS_OFFSET)
528528

529529
#endif // LLVM_OPTION_OPTTABLE_H

‎llvm/unittests/Option/OptionMarshallingTest.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ static const OptionWithMarshallingInfo MarshallingTable[] = {
2929
#define OPTION_WITH_MARSHALLING( \
3030
PREFIX_TYPE, PREFIXED_NAME_OFFSET, ID, KIND, GROUP, ALIAS, ALIASARGS, \
3131
FLAGS, VISIBILITY, PARAM, HELPTEXT, HELPTEXTSFORVARIANTS, METAVAR, VALUES, \
32-
COMMANDIDS_OFFSET, SHOULD_PARSE, ALWAYS_EMIT, KEYPATH, DEFAULT_VALUE, \
32+
SUBCOMMANDIDS_OFFSET, SHOULD_PARSE, ALWAYS_EMIT, KEYPATH, DEFAULT_VALUE, \
3333
IMPLIED_CHECK, IMPLIED_VALUE, NORMALIZER, DENORMALIZER, MERGER, EXTRACTOR, \
3434
TABLE_INDEX) \
3535
{PREFIXED_NAME_OFFSET, #KEYPATH, #IMPLIED_CHECK, #IMPLIED_VALUE},

0 commit comments

Comments
 (0)