diff options
author | Hans Wennborg <hans@hanshq.net> | 2013-07-17 16:54:06 +0000 |
---|---|---|
committer | Hans Wennborg <hans@hanshq.net> | 2013-07-17 16:54:06 +0000 |
commit | b17a2c119877b47cb3fb68c76a91dfe4d8cc6199 (patch) | |
tree | 4cb0fdc17609a2c7bb6ac3e4693092b592071764 | |
parent | 215c57ff4a75388913dc392d03d84ec8c4c3ee1e (diff) |
Option parsing tables: remove some unnecessary #defines
Also make some strings static and add missing #undef's
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@186518 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | include/clang/Driver/CC1AsOptions.h | 2 | ||||
-rw-r--r-- | include/clang/Driver/Options.h | 2 | ||||
-rw-r--r-- | lib/Driver/CC1AsOptions.cpp | 7 | ||||
-rw-r--r-- | lib/Driver/DriverOptions.cpp | 7 |
4 files changed, 4 insertions, 14 deletions
diff --git a/include/clang/Driver/CC1AsOptions.h b/include/clang/Driver/CC1AsOptions.h index 7ce2525272..6d748488af 100644 --- a/include/clang/Driver/CC1AsOptions.h +++ b/include/clang/Driver/CC1AsOptions.h @@ -22,13 +22,11 @@ namespace driver { namespace cc1asoptions { enum ID { OPT_INVALID = 0, // This is not an option ID. -#define PREFIX(NAME, VALUE) #define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, FLAGS, PARAM, \ HELPTEXT, METAVAR) OPT_##ID, #include "clang/Driver/CC1AsOptions.inc" LastOption #undef OPTION -#undef PREFIX }; } diff --git a/include/clang/Driver/Options.h b/include/clang/Driver/Options.h index 650e8e75a6..1186c8489e 100644 --- a/include/clang/Driver/Options.h +++ b/include/clang/Driver/Options.h @@ -34,13 +34,11 @@ enum ClangFlags { enum ID { OPT_INVALID = 0, // This is not an option ID. -#define PREFIX(NAME, VALUE) #define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, FLAGS, PARAM, \ HELPTEXT, METAVAR) OPT_##ID, #include "clang/Driver/Options.inc" LastOption #undef OPTION -#undef PREFIX }; } diff --git a/lib/Driver/CC1AsOptions.cpp b/lib/Driver/CC1AsOptions.cpp index 62c3afbb36..eb5776d506 100644 --- a/lib/Driver/CC1AsOptions.cpp +++ b/lib/Driver/CC1AsOptions.cpp @@ -16,20 +16,17 @@ using namespace clang::driver; using namespace llvm::opt; using namespace clang::driver::cc1asoptions; -#define PREFIX(NAME, VALUE) const char *const NAME[] = VALUE; -#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, FLAGS, PARAM, \ - HELPTEXT, METAVAR) +#define PREFIX(NAME, VALUE) static const char *const NAME[] = VALUE; #include "clang/Driver/CC1AsOptions.inc" -#undef OPTION #undef PREFIX static const OptTable::Info CC1AsInfoTable[] = { -#define PREFIX(NAME, VALUE) #define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, FLAGS, PARAM, \ HELPTEXT, METAVAR) \ { PREFIX, NAME, HELPTEXT, METAVAR, OPT_##ID, Option::KIND##Class, PARAM, \ FLAGS, OPT_##GROUP, OPT_##ALIAS }, #include "clang/Driver/CC1AsOptions.inc" +#undef OPTION }; namespace { diff --git a/lib/Driver/DriverOptions.cpp b/lib/Driver/DriverOptions.cpp index 39787350cf..95518ee48b 100644 --- a/lib/Driver/DriverOptions.cpp +++ b/lib/Driver/DriverOptions.cpp @@ -16,20 +16,17 @@ using namespace clang::driver; using namespace clang::driver::options; using namespace llvm::opt; -#define PREFIX(NAME, VALUE) const char *const NAME[] = VALUE; -#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, FLAGS, PARAM, \ - HELPTEXT, METAVAR) +#define PREFIX(NAME, VALUE) static const char *const NAME[] = VALUE; #include "clang/Driver/Options.inc" -#undef OPTION #undef PREFIX static const OptTable::Info InfoTable[] = { -#define PREFIX(NAME, VALUE) #define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, FLAGS, PARAM, \ HELPTEXT, METAVAR) \ { PREFIX, NAME, HELPTEXT, METAVAR, OPT_##ID, Option::KIND##Class, PARAM, \ FLAGS, OPT_##GROUP, OPT_##ALIAS }, #include "clang/Driver/Options.inc" +#undef OPTION }; namespace { |