F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: refactor EnumChecker

Browse Source
This commit is contained in:
Peter D. Barnes, Jr
2020-04-10 16:09:51 -07:00
parent 2a704651d7
commit 6888c76550
2 changed files with 50 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/core/model/enum.cc
View File

@@ -20,6 +20,7 @@
#include "enum.h"
#include "fatal-error.h"
#include "log.h"
#include <algorithm> // find_if
#include <sstream>
/**
@@ -66,17 +67,8 @@ EnumValue::SerializeToString (Ptr<const AttributeChecker> checker) const
NS_LOG_FUNCTION (this << checker);
const EnumChecker *p = dynamic_cast<const EnumChecker *> (PeekPointer (checker));
NS_ASSERT (p != 0);
for (EnumChecker::ValueSet::const_iterator i = p->m_valueSet.begin (); i != p->m_valueSet.end (); i++)
{
if (i->first == m_value)
{
return i->second;
}
}
NS_FATAL_ERROR ("The user has set an invalid C++ value in this Enum");
// quiet compiler.
return "";
std::string name = p->GetName (m_value);
return name;
}
bool
EnumValue::DeserializeFromString (std::string value, Ptr<const AttributeChecker> checker)
@@ -84,15 +76,8 @@ EnumValue::DeserializeFromString (std::string value, Ptr<const AttributeChecker>
NS_LOG_FUNCTION (this << value << checker);
const EnumChecker *p = dynamic_cast<const EnumChecker *> (PeekPointer (checker));
NS_ASSERT (p != 0);
for (EnumChecker::ValueSet::const_iterator i = p->m_valueSet.begin (); i != p->m_valueSet.end (); i++)
{
if (i->second == value)
{
m_value = i->first;
return true;
}
}
return false;
m_value = p->GetValue (value);
return true;
}
EnumChecker::EnumChecker ()
@@ -112,6 +97,24 @@ EnumChecker::Add (int value, std::string name)
NS_LOG_FUNCTION (this << value << name);
m_valueSet.push_back (std::make_pair (value, name));
}
std::string
EnumChecker::GetName (int value) const
{
auto it = std::find_if (m_valueSet.begin (), m_valueSet.end (),
[value] (Value v) { return v.first == value; } );
NS_ASSERT_MSG (it != m_valueSet.end (),
"invalid enum value " << value << "! Missed entry in MakeEnumChecker?");
return it->second;
}
int
EnumChecker::GetValue (const std::string name) const
{
auto it = std::find_if (m_valueSet.begin (), m_valueSet.end (),
[name] (Value v) { return v.second == name; } );
NS_ASSERT_MSG (it != m_valueSet.end (),
"name " << name << "not a valid enum value. Missed entry in MakeEnumChecker?");
return it->first;
}
bool
EnumChecker::Check (const AttributeValue &value) const
{
@@ -121,14 +124,10 @@ EnumChecker::Check (const AttributeValue &value) const
{
return false;
}
for (ValueSet::const_iterator i = m_valueSet.begin (); i != m_valueSet.end (); i++)
{
if (i->first == p->Get ())
{
return true;
}
}
return false;
auto pvalue = p->Get ();
auto it = std::find_if (m_valueSet.begin (), m_valueSet.end (),
[pvalue] (Value v) { return v.first == pvalue; } );
return (it != m_valueSet.end ()) ? true : false;
}
std::string
EnumChecker::GetValueTypeName (void) const
@@ -147,14 +146,11 @@ EnumChecker::GetUnderlyingTypeInformation (void) const
{
NS_LOG_FUNCTION (this);
std::ostringstream oss;
for (ValueSet::const_iterator i = m_valueSet.begin (); i != m_valueSet.end ();)
bool moreValues = false;
for (const auto i : m_valueSet)
{
oss << i->second;
i++;
if (i != m_valueSet.end ())
{
oss << "|";
}
oss << (moreValues ? "|" : "") << i.second;
moreValues = true;
}
return oss.str ();
}

22
src/core/model/enum.h
View File

@@ -96,10 +96,25 @@ public:
/**
* Add a new value.
* \param [in] value The value.
* \param [in] name Then enum symbol name.
* \param [in] name The enum symbol name.
*/
void Add (int value, std::string name);
/**
* Get the enum symbol name by value.
* \param [in] value The value.
* \return The enum symbol name.
*/
std::string GetName (int value) const;
/**
* Get the enum value by name.
* \param [in] name Then enum symbol name.
* \returns The enum value.
*/
int GetValue (const std::string name) const;
// Inherited
virtual bool Check (const AttributeValue &value) const;
virtual std::string GetValueTypeName (void) const;
virtual bool HasUnderlyingTypeInformation (void) const;
@@ -108,9 +123,10 @@ public:
virtual bool Copy (const AttributeValue &src, AttributeValue &dst) const;
private:
friend class EnumValue;
/** Type for the pair value, name */
typedef std::pair<int,std::string> Value;
/** Type of container for storing Enum values and symbol names. */
typedef std::list<std::pair<int,std::string> > ValueSet;
typedef std::list<Value> ValueSet;
/** The stored Enum values and symbol names. */
ValueSet m_valueSet;
};