summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/Support/CommandLine.h57
-rw-r--r--include/llvm/Support/CommandLine.h57
-rw-r--r--lib/Support/CommandLine.cpp2
-rw-r--r--support/lib/Support/CommandLine.cpp2
4 files changed, 98 insertions, 20 deletions
diff --git a/include/Support/CommandLine.h b/include/Support/CommandLine.h
index 3c0ac1ac69..b07b162a47 100644
--- a/include/Support/CommandLine.h
+++ b/include/Support/CommandLine.h
@@ -176,12 +176,22 @@ public:
// Boolean/flag command line option
//
class Flag : public Option {
- bool Value;
+ bool &Value;
+ bool DValue;
virtual bool handleOccurance(const char *ArgName, const std::string &Arg);
public:
inline Flag(const char *ArgStr, const char *Message, int Flags = 0,
- bool DefaultVal = 0) : Option(ArgStr, Message, Flags),
- Value(DefaultVal) {}
+ bool DefaultVal = false)
+ : Option(ArgStr, Message, Flags), Value(DValue) {
+ Value = DefaultVal;
+ }
+
+ inline Flag(bool &UpdateVal, const char *ArgStr, const char *Message,
+ int Flags = 0, bool DefaultVal = false)
+ : Option(ArgStr, Message, Flags), Value(UpdateVal) {
+ Value = DefaultVal;
+ }
+
operator const bool() const { return Value; }
inline bool operator=(bool Val) { Value = Val; return Val; }
};
@@ -278,7 +288,6 @@ public:
class EnumValueBase : public EnumBase {
protected:
- int Value;
inline EnumValueBase(const char *ArgStr, const char *Help, int Flags)
: EnumBase(ArgStr, Help, Flags) {}
inline EnumValueBase(int Flags) : EnumBase(Flags) {}
@@ -293,6 +302,9 @@ protected:
// to-be-maintained width is specified.
//
virtual void printOptionInfo(unsigned GlobalWidth) const;
+
+ // setValue - Subclasses override this when they need to receive a new value
+ virtual void setValue(int Val) = 0;
};
template <class E> // The enum we are representing
@@ -300,17 +312,31 @@ class Enum : public EnumValueBase {
virtual enum ValueExpected getValueExpectedFlagDefault() const {
return ValueRequired;
}
+ E DVal;
+ E &Value;
+
+ // setValue - Subclasses override this when they need to receive a new value
+ virtual void setValue(int Val) { Value = (E)Val; }
public:
inline Enum(const char *ArgStr, int Flags, const char *Help, ...)
- : EnumValueBase(ArgStr, Help, Flags) {
+ : EnumValueBase(ArgStr, Help, Flags), Value(DVal) {
va_list Values;
va_start(Values, Help);
processValues(Values);
va_end(Values);
- Value = ValueMap.front().second.first; // Grab default value
+ Value = (E)ValueMap.front().second.first; // Grab default value
}
- inline operator E() const { return (E)Value; }
+ inline Enum(E &EUpdate, const char *ArgStr, int Flags, const char *Help, ...)
+ : EnumValueBase(ArgStr, Help, Flags), Value(EUpdate) {
+ va_list Values;
+ va_start(Values, Help);
+ processValues(Values);
+ va_end(Values);
+ Value = (E)ValueMap.front().second.first; // Grab default value
+ }
+
+ inline operator E() const { return Value; }
inline E operator=(E Val) { Value = Val; return Val; }
};
@@ -337,14 +363,27 @@ protected:
template <class E> // The enum we are representing
class EnumFlags : public EnumFlagsBase {
+ E DVal;
+ E &Value;
+
+ // setValue - Subclasses override this when they need to receive a new value
+ virtual void setValue(int Val) { Value = (E)Val; }
public:
- inline EnumFlags(int Flags, ...) : EnumFlagsBase(Flags) {
+ inline EnumFlags(int Flags, ...) : EnumFlagsBase(Flags), Value(DVal) {
+ va_list Values;
+ va_start(Values, Flags);
+ processValues(Values);
+ va_end(Values);
+ registerArgs();
+ Value = (E)ValueMap.front().second.first; // Grab default value
+ }
+ inline EnumFlags(E &RV, int Flags, ...) : EnumFlagsBase(Flags), Value(RV) {
va_list Values;
va_start(Values, Flags);
processValues(Values);
va_end(Values);
registerArgs();
- Value = ValueMap.front().second.first; // Grab default value
+ Value = (E)ValueMap.front().second.first; // Grab default value
}
inline operator E() const { return (E)Value; }
diff --git a/include/llvm/Support/CommandLine.h b/include/llvm/Support/CommandLine.h
index 3c0ac1ac69..b07b162a47 100644
--- a/include/llvm/Support/CommandLine.h
+++ b/include/llvm/Support/CommandLine.h
@@ -176,12 +176,22 @@ public:
// Boolean/flag command line option
//
class Flag : public Option {
- bool Value;
+ bool &Value;
+ bool DValue;
virtual bool handleOccurance(const char *ArgName, const std::string &Arg);
public:
inline Flag(const char *ArgStr, const char *Message, int Flags = 0,
- bool DefaultVal = 0) : Option(ArgStr, Message, Flags),
- Value(DefaultVal) {}
+ bool DefaultVal = false)
+ : Option(ArgStr, Message, Flags), Value(DValue) {
+ Value = DefaultVal;
+ }
+
+ inline Flag(bool &UpdateVal, const char *ArgStr, const char *Message,
+ int Flags = 0, bool DefaultVal = false)
+ : Option(ArgStr, Message, Flags), Value(UpdateVal) {
+ Value = DefaultVal;
+ }
+
operator const bool() const { return Value; }
inline bool operator=(bool Val) { Value = Val; return Val; }
};
@@ -278,7 +288,6 @@ public:
class EnumValueBase : public EnumBase {
protected:
- int Value;
inline EnumValueBase(const char *ArgStr, const char *Help, int Flags)
: EnumBase(ArgStr, Help, Flags) {}
inline EnumValueBase(int Flags) : EnumBase(Flags) {}
@@ -293,6 +302,9 @@ protected:
// to-be-maintained width is specified.
//
virtual void printOptionInfo(unsigned GlobalWidth) const;
+
+ // setValue - Subclasses override this when they need to receive a new value
+ virtual void setValue(int Val) = 0;
};
template <class E> // The enum we are representing
@@ -300,17 +312,31 @@ class Enum : public EnumValueBase {
virtual enum ValueExpected getValueExpectedFlagDefault() const {
return ValueRequired;
}
+ E DVal;
+ E &Value;
+
+ // setValue - Subclasses override this when they need to receive a new value
+ virtual void setValue(int Val) { Value = (E)Val; }
public:
inline Enum(const char *ArgStr, int Flags, const char *Help, ...)
- : EnumValueBase(ArgStr, Help, Flags) {
+ : EnumValueBase(ArgStr, Help, Flags), Value(DVal) {
va_list Values;
va_start(Values, Help);
processValues(Values);
va_end(Values);
- Value = ValueMap.front().second.first; // Grab default value
+ Value = (E)ValueMap.front().second.first; // Grab default value
}
- inline operator E() const { return (E)Value; }
+ inline Enum(E &EUpdate, const char *ArgStr, int Flags, const char *Help, ...)
+ : EnumValueBase(ArgStr, Help, Flags), Value(EUpdate) {
+ va_list Values;
+ va_start(Values, Help);
+ processValues(Values);
+ va_end(Values);
+ Value = (E)ValueMap.front().second.first; // Grab default value
+ }
+
+ inline operator E() const { return Value; }
inline E operator=(E Val) { Value = Val; return Val; }
};
@@ -337,14 +363,27 @@ protected:
template <class E> // The enum we are representing
class EnumFlags : public EnumFlagsBase {
+ E DVal;
+ E &Value;
+
+ // setValue - Subclasses override this when they need to receive a new value
+ virtual void setValue(int Val) { Value = (E)Val; }
public:
- inline EnumFlags(int Flags, ...) : EnumFlagsBase(Flags) {
+ inline EnumFlags(int Flags, ...) : EnumFlagsBase(Flags), Value(DVal) {
+ va_list Values;
+ va_start(Values, Flags);
+ processValues(Values);
+ va_end(Values);
+ registerArgs();
+ Value = (E)ValueMap.front().second.first; // Grab default value
+ }
+ inline EnumFlags(E &RV, int Flags, ...) : EnumFlagsBase(Flags), Value(RV) {
va_list Values;
va_start(Values, Flags);
processValues(Values);
va_end(Values);
registerArgs();
- Value = ValueMap.front().second.first; // Grab default value
+ Value = (E)ValueMap.front().second.first; // Grab default value
}
inline operator E() const { return (E)Value; }
diff --git a/lib/Support/CommandLine.cpp b/lib/Support/CommandLine.cpp
index 194dd33b27..c3f18bd152 100644
--- a/lib/Support/CommandLine.cpp
+++ b/lib/Support/CommandLine.cpp
@@ -346,7 +346,7 @@ bool EnumValueBase::handleOccurance(const char *ArgName, const string &Arg) {
return error(": unrecognized alternative '" + Arg +
"'! Alternatives are: " + Alternatives);
}
- Value = ValueMap[i].second.first;
+ setValue(ValueMap[i].second.first);
return false;
}
diff --git a/support/lib/Support/CommandLine.cpp b/support/lib/Support/CommandLine.cpp
index 194dd33b27..c3f18bd152 100644
--- a/support/lib/Support/CommandLine.cpp
+++ b/support/lib/Support/CommandLine.cpp
@@ -346,7 +346,7 @@ bool EnumValueBase::handleOccurance(const char *ArgName, const string &Arg) {
return error(": unrecognized alternative '" + Arg +
"'! Alternatives are: " + Alternatives);
}
- Value = ValueMap[i].second.first;
+ setValue(ValueMap[i].second.first);
return false;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 23:42:34 +0000