generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-12-22 13:13:13 +01:00
Code Issues Projects Releases Wiki Activity

update pack/unpack routines

Browse Source 
git-svn-id: file:///Users/frsyuki/project/msgpack-git/svn/x@100 5a5092ae-2292-43ba-b2d5-dcab9c1a2731
This commit is contained in:
frsyuki
2009-02-15 09:10:02 +00:00
parent 81a771094d
commit a114f4a5a5
32 changed files with 503 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cpp/type/array.hpp
View File

@@ -29,11 +29,11 @@ inline std::vector<T> operator>> (object o, std::vector<T>& v)
{
if(o.type != type::ARRAY) { throw type_error(); }
v.resize(o.via.container.size);
object* p(o.via.container.ptr);
object* const pend(o.via.container.ptr + o.via.container.size);
T* it(&v.front());
object* p = o.via.container.ptr;
object* const pend = o.via.container.ptr + o.via.container.size;
T* it = &v.front();
for(; p < pend; ++p, ++it) {
convert(*it, *p);
p->convert(it);
}
return v;
}
@@ -45,7 +45,7 @@ inline packer<Stream>& operator<< (packer<Stream>& o, const std::vector<T>& v)
o.pack_array(v.size());
for(typename std::vector<T>::const_iterator it(v.begin()), it_end(v.end());
it != it_end; ++it) {
pack(o, *it);
o.pack(*it);
}
return o;
}

34
cpp/type/map.hpp
View File

@@ -47,12 +47,12 @@ inline type::assoc_vector<K,V>& operator>> (object o, type::assoc_vector<K,V>& v
{
if(o.type != type::MAP) { throw type_error(); }
v.resize(o.via.container.size);
object* p(o.via.container.ptr);
object* const pend(o.via.container.ptr + o.via.container.size);
object* p = o.via.container.ptr;
object* const pend = o.via.container.ptr + o.via.container.size;
std::pair<K, V>* it(&v.front());
for(; p < pend; ++it) {
convert(it->first, *p); ++p;
convert(it->second, *p); ++p;
p->convert(&it->first); ++p;
p->convert(&it->second); ++p;
}
std::sort(v.begin(), v.end(), type::detail::pair_first_less<K,V>());
return v;
@@ -64,8 +64,8 @@ inline packer<Stream>& operator<< (packer<Stream>& o, const type::assoc_vector<K
o.pack_map(v.size());
for(typename type::assoc_vector<K,V>::const_iterator it(v.begin()), it_end(v.end());
it != it_end; ++it) {
pack(o, it->first);
pack(o, it->second);
o.pack(it->first);
o.pack(it->second);
}
return o;
}
@@ -79,14 +79,14 @@ inline std::map<K, V> operator>> (object o, std::map<K, V>& v)
object* const pend(o.via.container.ptr + o.via.container.size*2);
while(p < pend) {
K key;
convert(key, *p); ++p;
p->convert(&key); ++p;
typename std::map<K,V>::iterator it(v.find(key));
if(it != v.end()) {
V val;
convert(val, *p); ++p;
p->convert(&val); ++p;
it->insert( std::pair<K,V>(key, val) );
} else {
convert(it->second, *p); ++p;
p->convert(&it->second); ++p;
}
}
return v;
@@ -98,8 +98,8 @@ inline packer<Stream>& operator<< (packer<Stream>& o, const std::map<K,V>& v)
o.pack_map(v.size());
for(typename std::map<K,V>::const_iterator it(v.begin()), it_end(v.end());
it != it_end; ++it) {
pack(o, it->first);
pack(o, it->second);
o.pack(it->first);
o.pack(it->second);
}
return o;
}
@@ -109,12 +109,12 @@ template <typename K, typename V>
inline std::multimap<K, V> operator>> (object o, std::multimap<K, V>& v)
{
if(o.type != type::MAP) { throw type_error(); }
object* p(o.via.container.ptr);
object* const pend(o.via.container.ptr + o.via.container.size*2);
object* p = o.via.container.ptr;
object* const pend = o.via.container.ptr + o.via.container.size*2;
while(p < pend) {
std::pair<K, V> value;
convert(value.first, *p); ++p;
convert(value.second, *p); ++p;
p->convert(&value.first); ++p;
p->convert(&value.second); ++p;
v.insert(value);
}
return v;
@@ -126,8 +126,8 @@ inline packer<Stream>& operator<< (packer<Stream>& o, const std::multimap<K,V>&
o.pack_multimap(v.size());
for(typename std::multimap<K,V>::const_iterator it(v.begin()), it_end(v.end());
it != it_end; ++it) {
pack(o, it->first);
pack(o, it->second);
o.pack(it->first);
o.pack(it->second);
}
return o;
}

6
cpp/type/tuple.hpp.erb
View File

@@ -111,7 +111,7 @@ struct tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> {
tuple() {}
tuple(typename tuple_type<A0>::transparent_reference _a0<%1.upto(i) {|j|%>, typename tuple_type<A<%=j%>>::transparent_reference _a<%=j%><%}%>) :
a0(_a0)<%1.upto(i) {|j|%>, a<%=j%>(_a<%=j%>)<%}%> {}
tuple(object o) { convert(*this, o); }
tuple(object o) { o.convert(this); }
template <int N> typename tuple_element<value_type, N>::reference get()
{ return tuple_element<value_type, N>(*this).get(); }
template <int N> typename const_tuple_element<value_type, N>::const_reference get() const
@@ -138,7 +138,7 @@ type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>& operator>> (
if(o.type != type::ARRAY) { throw type_error(); }
if(o.via.container.size < <%=i+1%>) { throw type_error(); }
<%0.upto(i) {|j|%>
convert<A<%=j%>>(v.template get<<%=j%>>(), o.via.container.ptr[<%=j%>]);<%}%>
o.via.container.ptr[<%=j%>].convert<A<%=j%>>(&v.template get<<%=j%>>());<%}%>
return v;
}
<%}%>
@@ -158,7 +158,7 @@ const packer<Stream>& operator<< (
const type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>& v) {
o.pack_array(<%=i+1%>);
<%0.upto(i) {|j|%>
pack(o, v.template get<<%=j%>>());<%}%>
o.pack(v.template get<<%=j%>>());<%}%>
return o;
}
<%}%>