cpp: object::object(const T& v, zone* z)

This commit is contained in:
frsyuki 2010-04-25 01:12:25 +09:00
parent 120e8bffd7
commit 4e85ebbf98
10 changed files with 152 additions and 1 deletions

View File

@ -20,6 +20,7 @@
#include "msgpack/object.h"
#include "msgpack/pack.hpp"
#include "msgpack/zone.hpp"
#include <string.h>
#include <stdexcept>
#include <typeinfo>
@ -92,6 +93,9 @@ struct object {
template <typename T>
object(const T& v);
template <typename T>
object(const T& v, zone* z);
template <typename T>
object& operator=(const T& v);
@ -100,6 +104,10 @@ struct object {
private:
struct implicit_type;
public:
// FIXME private?
struct object_zone;
public:
implicit_type convert() const;
};
@ -109,6 +117,14 @@ struct object_kv {
object val;
};
struct object::object_zone : object {
object_zone(msgpack::zone* zone) : zone(zone) { }
msgpack::zone* zone;
private:
object_zone();
};
bool operator==(const object x, const object y);
bool operator!=(const object x, const object y);
@ -230,6 +246,15 @@ inline object& object::operator=(const T& v)
return *this;
}
template <typename T>
object::object(const T& v, zone* z)
{
object_zone oz(z);
oz << v;
type = oz.type;
via = oz.via;
}
inline object::operator msgpack_object()
{

View File

@ -49,6 +49,22 @@ inline packer<Stream>& operator<< (packer<Stream>& o, const std::deque<T>& v)
return o;
}
template <typename T>
inline void operator<< (object::object_zone& o, const std::deque<T>& v)
{
o.type = type::ARRAY;
object* p = (object*)o.zone->malloc(sizeof(object)*v.size());
object* const pend = p + v.size();
o.via.array.ptr = p;
o.via.array.size = v.size();
typename std::deque<T>::const_iterator it(v.begin());
do {
*p = object(*it, o.zone);
++p;
++it;
} while(p < pend);
}
} // namespace msgpack

View File

@ -49,6 +49,22 @@ inline packer<Stream>& operator<< (packer<Stream>& o, const std::list<T>& v)
return o;
}
template <typename T>
inline void operator<< (object::object_zone& o, const std::list<T>& v)
{
o.type = type::ARRAY;
object* p = (object*)o.zone->malloc(sizeof(object)*v.size());
object* const pend = p + v.size();
o.via.array.ptr = p;
o.via.array.size = v.size();
typename std::list<T>::const_iterator it(v.begin());
do {
*p = object(*it, o.zone);
++p;
++it;
} while(p < pend);
}
} // namespace msgpack

View File

@ -43,6 +43,17 @@ inline packer<Stream>& operator<< (packer<Stream>& o, const std::pair<T1, T2>& v
return o;
}
template <typename T1, typename T2>
inline void operator<< (object::object_zone& o, const std::pair<T1, T2>& v)
{
o.type = type::ARRAY;
object* p = (object*)o.zone->malloc(sizeof(object)*2);
o.via.array.ptr = p;
o.via.array.size = 2;
p[0] = object(v.first, o.zone);
p[1] = object(v.second, o.zone);
}
} // namespace msgpack

View File

@ -77,6 +77,13 @@ inline packer<Stream>& operator<< (packer<Stream>& o, const type::raw_ref& v)
return o;
}
inline void operator<< (object& o, const type::raw_ref& v)
{
o.type = type::RAW;
o.via.raw.ptr = v.ptr;
o.via.raw.size = v.size;
}
} // namespace msgpack

View File

@ -48,6 +48,22 @@ inline packer<Stream>& operator<< (packer<Stream>& o, const std::set<T>& v)
return o;
}
template <typename T>
inline void operator<< (object::object_zone& o, const std::set<T>& v)
{
o.type = type::ARRAY;
object* p = (object*)o.zone->malloc(sizeof(object)*v.size());
object* const pend = p + v.size();
o.via.array.ptr = p;
o.via.array.size = v.size();
typename std::set<T>::const_iterator it(v.begin());
do {
*p = object(*it, o.zone);
++p;
++it;
} while(p < pend);
}
template <typename T>
inline std::multiset<T>& operator>> (object o, std::multiset<T>& v)
@ -73,6 +89,22 @@ inline packer<Stream>& operator<< (packer<Stream>& o, const std::multiset<T>& v)
return o;
}
template <typename T>
inline void operator<< (object::object_zone& o, const std::multiset<T>& v)
{
o.type = type::ARRAY;
object* p = (object*)o.zone->malloc(sizeof(object)*v.size());
object* const pend = p + v.size();
o.via.array.ptr = p;
o.via.array.size = v.size();
typename std::multiset<T>::const_iterator it(v.begin());
do {
*p = object(*it, o.zone);
++p;
++it;
} while(p < pend);
}
} // namespace msgpack

View File

@ -39,6 +39,15 @@ inline packer<Stream>& operator<< (packer<Stream>& o, const std::string& v)
return o;
}
inline void operator<< (object::object_zone& o, const std::string& v)
{
o.type = type::RAW;
char* ptr = (char*)o.zone->malloc(v.size());
o.via.raw.ptr = ptr;
o.via.raw.size = v.size();
memcpy(ptr, v.data(), v.size());
}
} // namespace msgpack

View File

@ -165,6 +165,26 @@ const packer<Stream>& operator<< (
}
<%}%>
inline void operator<< (
object::object_zone& o,
const type::tuple<>& v) {
o.type = type::ARRAY;
o.via.array.ptr = NULL;
o.via.array.size = 0;
}
<%0.upto(GENERATION_LIMIT) {|i|%>
template <typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
inline void operator<< (
object::object_zone& o,
const type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>& v) {
o.type = type::ARRAY;
o.via.array.ptr = (object*)o.zone->malloc(sizeof(object)*<%=i+1%>);
o.via.array.size = <%=i+1%>;
<%0.upto(i) {|j|%>
o.via.array.ptr[<%=j%>] = object(v.template get<<%=j%>>(), o.zone);<%}%>
}
<%}%>
} // namespace msgpack
#endif /* msgpack/type/tuple.hpp */

View File

@ -53,6 +53,22 @@ inline packer<Stream>& operator<< (packer<Stream>& o, const std::vector<T>& v)
return o;
}
template <typename T>
inline void operator<< (object::object_zone& o, const std::vector<T>& v)
{
o.type = type::ARRAY;
object* p = (object*)o.zone->malloc(sizeof(object)*v.size());
object* const pend = p + v.size();
o.via.array.ptr = p;
o.via.array.size = v.size();
typename std::vector<T>::const_iterator it(v.begin());
do {
*p = object(*it, o.zone);
++p;
++it;
} while(p < pend);
}
} // namespace msgpack

View File

@ -18,7 +18,6 @@
#ifndef MSGPACK_ZONE_HPP__
#define MSGPACK_ZONE_HPP__
#include "msgpack/object.hpp"
#include "msgpack/zone.h"
#include <cstdlib>
#include <memory>