Update InvocationOptions

This commit is contained in:
Jonas Hahnfeld 2023-07-10 08:38:35 +02:00 committed by jenkins
parent aa2213e121
commit f4951f96e9
2 changed files with 10 additions and 7 deletions

View File

@ -6,10 +6,10 @@
// Prefixes
#define COMMA ,
PREFIX(prefix_0, {0})
PREFIX(prefix_1, {"-" COMMA 0})
PREFIX(prefix_3, {"-" COMMA "--" COMMA 0})
PREFIX(prefix_2, {"--" COMMA 0})
PREFIX(prefix_0, {llvm::StringLiteral("")})
PREFIX(prefix_1, {llvm::StringLiteral("-") COMMA llvm::StringLiteral("")})
PREFIX(prefix_3, {llvm::StringLiteral("-") COMMA llvm::StringLiteral("--") COMMA llvm::StringLiteral("")})
PREFIX(prefix_2, {llvm::StringLiteral("--") COMMA llvm::StringLiteral("")})
#undef COMMA
#ifndef OPTION

View File

@ -42,7 +42,10 @@ namespace {
static const char kNoStdInc[] = "-nostdinc";
#endif
#define PREFIX(NAME, VALUE) const char *const NAME[] = VALUE;
#define PREFIX(NAME, VALUE) \
static constexpr llvm::StringLiteral NAME##_init[] = VALUE; \
static constexpr llvm::ArrayRef<llvm::StringLiteral> NAME( \
NAME##_init, std::size(NAME##_init) - 1);
#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \
HELPTEXT, METAVAR, VALUES)
#include "cling/Interpreter/ClingOptions.inc"
@ -60,10 +63,10 @@ static const char kNoStdInc[] = "-nostdinc";
#undef PREFIX
};
class ClingOptTable : public OptTable {
class ClingOptTable : public GenericOptTable {
public:
ClingOptTable()
: OptTable(ClingInfoTable) {}
: GenericOptTable(ClingInfoTable) {}
};
static OptTable* CreateClingOptTable() {