ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better interoperation between Json::Value and JsonObject.

Browse Source 
* Generic functions to add entries to both object models.
* Add Json::Value into JsonObjects.
* Write Json::Value to string incrementally.
* Get rid of ripple::RPC::New namespace
This commit is contained in:
Tom Ritchford
2014-12-01 20:35:09 -05:00
committed by Vinnie Falco
parent 7cfac1a91a
commit 8053598069
16 changed files with 567 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/ripple/rpc/impl/JsonObject.cpp
View File

@@ -18,11 +18,9 @@
//==============================================================================
#include <ripple/rpc/impl/JsonObject.h>
#include <ripple/rpc/impl/JsonWriter.h>
namespace ripple {
namespace RPC {
namespace New {
Collection::Collection (Collection* parent, Writer* writer)
: parent_ (parent), writer_ (writer), enabled_ (true)
@@ -71,31 +69,9 @@ void Collection::checkWritable (std::string const& label)
//------------------------------------------------------------------------------
template <typename Scalar>
Array& Array::append (Scalar value)
{
checkWritable ("append");
if (writer_)
writer_->append (value);
return *this;
}
//------------------------------------------------------------------------------
Object::Root::Root (Writer& w) : Object (nullptr, &w)
{
writer_->startRoot (Writer::object); // writer_ can't be null.
}
//------------------------------------------------------------------------------
template <typename Scalar>
Object& Object::set (std::string const& key, Scalar value)
{
checkWritable ("set");
if (writer_)
writer_->set (key, value);
return *this;
writer_->startRoot (Writer::object);
}
Object Object::makeObject (std::string const& key)
@@ -113,6 +89,8 @@ Array Object::makeArray (std::string const& key) {
return Array (this, writer_);
}
//------------------------------------------------------------------------------
Object Array::makeObject ()
{
checkWritable ("Array::makeObject");
@@ -139,9 +117,44 @@ Object::Proxy::Proxy (Object& object, std::string const& key)
Object::Proxy Object::operator[] (std::string const& key)
{
return {*this, key};
return Proxy (*this, key);
}
Object::Proxy Object::operator[] (Json::StaticString const& key)
{
return Proxy (*this, std::string (key));
}
namespace {
template <class Object>
void doCopyFrom (Object& to, Json::Value const& from)
{
auto members = from.getMemberNames();
for (auto& m: members)
to[m] = from[m];
}
}
void copyFrom (Json::Value& to, Json::Value const& from)
{
if (to.empty()) // Short circuit this very common case.
to = from;
else
doCopyFrom (to, from);
}
void copyFrom (Object& to, Json::Value const& from)
{
doCopyFrom (to, from);
}
WriterObject stringWriterObject (std::string& s)
{
return WriterObject (stringOutput (s));
}
} // New
} // RPC
} // ripple