generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-04-03 18:10:13 +02:00
Code Issues Projects Releases Wiki Activity

lang/c/msgpack: C++ binding: implemented msgpack::object >> packer<Stream>

Browse Source 
git-svn-id: file:///Users/frsyuki/project/msgpack-git/svn/x@69 5a5092ae-2292-43ba-b2d5-dcab9c1a2731
This commit is contained in:
frsyuki 2009-02-15 09:09:58 +00:00
parent b790df530a
commit a7936ba05b
2 changed files with 92 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cpp/object.cpp
View File

@ -81,7 +81,7 @@ std::ostream& operator<< (std::ostream& s, const object o)
default: default:
// FIXME // FIXME
s << "#<UNKNOWN " << (uint16_t)o.type << ">" << std::endl; s << "#<UNKNOWN " << (uint16_t)o.type << ">";
} }
return s; return s;
} }
@ -113,7 +113,7 @@ bool operator==(const object x, const object y)
for(object* px(x.via.container.ptr), for(object* px(x.via.container.ptr),
* const pxend(x.via.container.ptr + x.via.container.size), * const pxend(x.via.container.ptr + x.via.container.size),
* py(y.via.container.ptr); * py(y.via.container.ptr);
px != pxend; ++px, ++py) { px < pxend; ++px, ++py) {
if(*px != *py) { return false; } if(*px != *py) { return false; }
} }
return true; return true;
@ -124,7 +124,7 @@ bool operator==(const object x, const object y)
for(object* px(x.via.container.ptr), for(object* px(x.via.container.ptr),
* const pxend(x.via.container.ptr + x.via.container.size*2), * const pxend(x.via.container.ptr + x.via.container.size*2),
* py(y.via.container.ptr); * py(y.via.container.ptr);
px != pxend; ++px, ++py) { px < pxend; ++px, ++py) {
if(*px != *py) { return false; } if(*px != *py) { return false; }
} }
return true; return true;
@ -135,10 +135,5 @@ bool operator==(const object x, const object y)
} }
// FIXME
//template <typename Stream>
//const object& operator>> (const object& v, packer<Stream>& o);
} // namespace msgpack } // namespace msgpack

92
cpp/object.hpp
View File

@ -22,6 +22,7 @@
#include <stdint.h> #include <stdint.h>
#include <stdexcept> #include <stdexcept>
#include <typeinfo> #include <typeinfo>
#include <limits>
#include <ostream> #include <ostream>
namespace msgpack { namespace msgpack {
@ -46,7 +47,9 @@ struct object {
uint32_t size; uint32_t size;
} ref; } ref;
} via; } via;
// FIXME template <typename T> operator T() { T v; convert(*this, v); return v; };
template <typename T>
operator T() { T v; convert(v, *this); return v; };
}; };
std::ostream& operator<< (std::ostream& s, const object o); std::ostream& operator<< (std::ostream& s, const object o);
@ -55,6 +58,9 @@ bool operator==(const object x, const object y);
inline bool operator!=(const object x, const object y) { return !(x == y); } inline bool operator!=(const object x, const object y) { return !(x == y); }
inline object& operator<< (object& v, object o)
{ v = o; return v; }
template <typename Stream> template <typename Stream>
const object& operator>> (const object& v, packer<Stream>& o); const object& operator>> (const object& v, packer<Stream>& o);
@ -73,7 +79,7 @@ namespace type {
template <typename T> template <typename T>
inline T& operator<< (T& v, object o) inline T& operator<< (T& v, object o)
{ {
v = o; v.msgpack_unpack(o);
return v; return v;
} }
@ -87,7 +93,7 @@ namespace type {
template <typename Stream, typename T> template <typename Stream, typename T>
inline const T& operator>> (const T& v, packer<Stream>& o) inline const T& operator>> (const T& v, packer<Stream>& o)
{ {
detail::pack_copy(v.pack(), o); detail::pack_copy(v.msgpack_pack(), o);
return v; return v;
} }
@ -118,6 +124,86 @@ inline void pack(T& v, Stream& s)
} }
template <typename Stream>
const object& operator>> (const object& v, packer<Stream>& o)
{
switch(v.type) {
case type::NIL:
o.pack_nil();
return v;
case type::BOOLEAN:
if(v.via.boolean) {
o.pack_true();
} else {
o.pack_false();
}
return v;
case type::POSITIVE_INTEGER:
if(v.via.u64 <= (uint64_t)std::numeric_limits<uint16_t>::max()) {
if(v.via.u64 <= (uint16_t)std::numeric_limits<uint8_t>::max()) {
o.pack_uint8(v.via.u64);
} else {
o.pack_uint16(v.via.u64);
}
} else {
if(v.via.u64 <= (uint64_t)std::numeric_limits<uint32_t>::max()) {
o.pack_uint32(v.via.u64);
} else {
o.pack_uint64(v.via.u64);
}
}
return v;
case type::NEGATIVE_INTEGER:
if(v.via.i64 >= (int64_t)std::numeric_limits<int16_t>::min()) {
if(v.via.i64 >= (int64_t)std::numeric_limits<int8_t>::min()) {
o.pack_int8(v.via.i64);
} else {
o.pack_int16(v.via.i64);
}
} else {
if(v.via.i64 >= (int64_t)std::numeric_limits<int32_t>::min()) {
o.pack_int64(v.via.i64);
} else {
o.pack_int64(v.via.i64);
}
}
return v;
case type::RAW:
o.pack_raw(v.via.ref.ptr, v.via.ref.size);
return v;
case type::ARRAY:
o.pack_array(v.via.container.size);
for(object* p(v.via.container.ptr),
* const pend(v.via.container.ptr + v.via.container.size);
p < pend; ++p) {
*p >> o;
}
return v;
// FIXME loop optimiziation
case type::MAP:
o.pack_map(v.via.container.size);
for(object* p(v.via.container.ptr),
* const pend(v.via.container.ptr + v.via.container.size*2);
p < pend; ) {
*p >> o; ++p;
*p >> o; ++p;
}
return v;
// FIXME loop optimiziation
default:
throw type_error();
}
}
} // namespace msgpack } // namespace msgpack
#include "msgpack/type.hpp" #include "msgpack/type.hpp"