ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce likelihood of malformed SOTemplate:

Browse Source 
Formerly an SOTemplate was default constructed and its elements
added using push_back().  This left open the possibility of a
malformed SOTemplate if adding one of the elements caused a throw.

With this commit the SOTemplate requires an initializer_list of
its elements at construction.  Elements may not be added after
construction.  With this approach either the SOTemplate is fully
constructed with all of its elements or the constructor throws,
which prevents an invalid SOTemplate from even existing.

This change requires all SOTemplate construction to be adjusted
at the call site.  Those changes are also in this commit.

The SOE_Flags enum is also renamed to SOEStyle, which harmonizes
the name with other uses in the code base.  SOEStyle elements
are renamed (slightly) to have an "soe" prefix rather than "SOE_".
This heads toward reserving identifiers with all upper case for
macros.  The new style also aligns with other prominent enums in
the code base like the collection of TER identifiers.

SOElement is adjusted so it can be stored directly in an STL
container, rather than requiring storage in a unique_ptr.
Correspondingly, unique_ptr usage is removed from both
SOTemplate and KnownFormats.
This commit is contained in:
Scott Schurr
2019-02-27 12:56:22 -08:00
committed by Nik Bougalis
parent 57fe197d3e
commit afcc4ff296
17 changed files with 601 additions and 560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/ripple/protocol/STObject.h
View File

@@ -56,7 +56,7 @@ private:
typename T::value_type;
STObject* st_;
SOE_Flags style_;
SOEStyle style_;
TypedField<T> const* f_;
Proxy (Proxy const&) = default;
@@ -109,7 +109,7 @@ private:
/** Returns `true` if the field is set.
Fields with SOE_DEFAULT and set to the
Fields with soeDEFAULT and set to the
default value will return `true`
*/
explicit operator bool() const noexcept;
@@ -672,7 +672,7 @@ STObject::Proxy<T>::Proxy (STObject* st, TypedField<T> const* f)
}
else
{
style_ = SOE_INVALID;
style_ = soeINVALID;
}
}
@@ -684,7 +684,7 @@ STObject::Proxy<T>::value() const ->
auto const t = find();
if (t)
return t->value();
if (style_ != SOE_DEFAULT)
if (style_ != soeDEFAULT)
Throw<STObject::FieldErr> (
"Missing field '" + this->f_->getName() + "'");
return value_type{};
@@ -704,14 +704,14 @@ template <class U>
void
STObject::Proxy<T>::assign(U&& u)
{
if (style_ == SOE_DEFAULT &&
if (style_ == soeDEFAULT &&
u == value_type{})
{
st_->makeFieldAbsent(*f_);
return;
}
T* t;
if (style_ == SOE_INVALID)
if (style_ == soeINVALID)
t = dynamic_cast<T*>(
st_->getPField(*f_, true));
else
@@ -832,7 +832,7 @@ template <class T>
bool
STObject::OptionalProxy<T>::engaged() const noexcept
{
return this->style_ == SOE_DEFAULT
return this->style_ == soeDEFAULT
|| this->find() != nullptr;
}
@@ -840,11 +840,11 @@ template <class T>
void
STObject::OptionalProxy<T>::disengage()
{
if (this->style_ == SOE_REQUIRED ||
this->style_ == SOE_DEFAULT)
if (this->style_ == soeREQUIRED ||
this->style_ == soeDEFAULT)
Throw<STObject::FieldErr> (
"Template field error '" + this->f_->getName() + "'");
if (this->style_ == SOE_INVALID)
if (this->style_ == soeINVALID)
this->st_->delField(*this->f_);
else
this->st_->makeFieldAbsent(*this->f_);
@@ -878,10 +878,10 @@ STObject::operator[](TypedField<T> const& f) const
{
assert(mType);
assert(b->getSType() == STI_NOTPRESENT);
if(mType->style(f) == SOE_OPTIONAL)
if(mType->style(f) == soeOPTIONAL)
Throw<STObject::FieldErr> (
"Missing field '" + f.getName() + "'");
assert(mType->style(f) == SOE_DEFAULT);
assert(mType->style(f) == soeDEFAULT);
// Handle the case where value_type is a
// const reference, otherwise we return
// the address of a temporary.
@@ -905,9 +905,9 @@ STObject::operator[](OptionaledField<T> const& of) const
{
assert(mType);
assert(b->getSType() == STI_NOTPRESENT);
if(mType->style(*of.f) == SOE_OPTIONAL)
if(mType->style(*of.f) == soeOPTIONAL)
return boost::none;
assert(mType->style(*of.f) == SOE_DEFAULT);
assert(mType->style(*of.f) == soeDEFAULT);
return typename T::value_type{};
}
return u->value();