return (size1 < size2) ? -1 : 1;
}
-EnumWriter::EnumWriter ()
+EnumWriter&
+EnumWriter::instance()
{
if (_instance == 0) {
- _instance = this;
- }
+ _instance = new EnumWriter;
+ }
+
+ return *_instance;
+}
+
+void
+EnumWriter::destroy ()
+{
+ delete _instance;
+ _instance = 0;
+}
+
+EnumWriter::EnumWriter ()
+{
}
EnumWriter::~EnumWriter ()
if (x == registry.end()) {
error << string_compose (_("EnumWriter: unknown enumeration type \"%1\""), type) << endmsg;
- throw unknown_enumeration();
+ throw unknown_enumeration (type);
}
if (x->second.bitwise) {
if (x == registry.end()) {
error << string_compose (_("EnumWriter: unknown enumeration type \"%1\""), type) << endmsg;
- throw unknown_enumeration();
+ throw unknown_enumeration (type);
}
if (x->second.bitwise) {
return string();
}
+int
+EnumWriter::validate (EnumRegistration& er, int val)
+{
+ if (er.values.empty()) {
+ return val;
+ }
+
+ if (val == 0) {
+ /* zero is always a legal value for our enumerations, just about
+ */
+ return val;
+ }
+
+ vector<int>::iterator i;
+ string enum_name = _("unknown enumeration");
+
+ for (Registry::iterator x = registry.begin(); x != registry.end(); ++x) {
+ if (&er == &(*x).second) {
+ enum_name = (*x).first;
+ }
+ }
+
+
+ for (i = er.values.begin(); i != er.values.end(); ++i) {
+ if (*i == val) {
+ return val;
+ }
+ }
+
+ warning << string_compose (_("Illegal value loaded for %1 (%2) - %3 used instead"),
+ enum_name, val, er.names.front())
+ << endmsg;
+ return er.values.front();
+}
+
int
EnumWriter::read_bits (EnumRegistration& er, string str)
{
/* catch old-style hex numerics */
if (str.length() > 2 && str[0] == '0' && str[1] == 'x') {
- return strtol (str.c_str(), (char **) 0, 16);
+ int val = strtol (str.c_str(), (char **) 0, 16);
+ return validate (er, val);
}
/* catch old style dec numerics */
if (strspn (str.c_str(), "0123456789") == str.length()) {
- return strtol (str.c_str(), (char **) 0, 10);
- }
+ int val = strtol (str.c_str(), (char **) 0, 10);
+ return validate (er, val);
+ }
do {
} while (true);
if (!found) {
- throw unknown_enumeration();
+ throw unknown_enumeration (str);
}
return result;
/* catch old-style hex numerics */
if (str.length() > 2 && str[0] == '0' && str[1] == 'x') {
- return strtol (str.c_str(), (char **) 0, 16);
+ int val = strtol (str.c_str(), (char **) 0, 16);
+ return validate (er, val);
}
/* catch old style dec numerics */
if (strspn (str.c_str(), "0123456789") == str.length()) {
- return strtol (str.c_str(), (char **) 0, 10);
- }
+ int val = strtol (str.c_str(), (char **) 0, 10);
+ return validate (er, val);
+ }
for (i = er.values.begin(), s = er.names.begin(); i != er.values.end(); ++i, ++s) {
if (str == (*s) || nocase_cmp (str, *s) == 0) {
}
}
- throw unknown_enumeration();
+ throw unknown_enumeration(str);
}
void