}
int
-EnumWriter::validate (EnumRegistration& er, int val)
+EnumWriter::validate (EnumRegistration& er, int val) const
{
if (er.values.empty()) {
return val;
vector<int>::iterator i;
string enum_name = _("unknown enumeration");
- for (Registry::iterator x = registry.begin(); x != registry.end(); ++x) {
+ for (Registry::const_iterator x = registry.begin(); x != registry.end(); ++x) {
if (&er == &(*x).second) {
enum_name = (*x).first;
}
return er.values.front();
}
+int
+EnumWriter::validate_bitwise (EnumRegistration& er, int val) const
+{
+ int result = 0;
+ for (int p = 1; p <= val; p = p << 1) {
+ if (std::find (er.values.begin(), er.values.end(), p) == er.values.end()) {
+ continue;
+ }
+ if (p & val) {
+ result |= p;
+ }
+ }
+ return result;
+}
+
int
EnumWriter::read_bits (EnumRegistration& er, string str)
{
if (str.length() > 2 && str[0] == '0' && str[1] == 'x') {
int val = strtol (str.c_str(), (char **) 0, 16);
- return validate (er, val);
+ return validate_bitwise (er, val);
}
/* catch old style dec numerics */
if (strspn (str.c_str(), "0123456789") == str.length()) {
int val = strtol (str.c_str(), (char **) 0, 10);
- return validate (er, val);
+ return validate_bitwise (er, val);
}
do {
static EnumWriter* _instance;
static std::map<std::string,std::string> hack_table;
-
- int validate (EnumRegistration& er, int value);
+ int validate (EnumRegistration& er, int value) const;
+ int validate_bitwise (EnumRegistration& er, int value) const;
};
}