Changeset 20167 for lang/c

Timestamp:

09/28/08 22:05:11 (5 years ago)

Author:

frsyuki

Message:

lang/c/msgpack: C++ binding: pack()

Location:

lang/c/msgpack/trunk/cpp

Files:

• object.hpp (modified) (2 diffs)
• test.cpp (modified) (2 diffs)
• type/array.hpp (modified) (1 diff)
• type/boolean.hpp (modified) (2 diffs)
• type/integer.hpp (modified) (9 diffs)
• type/map.hpp (modified) (3 diffs)
• type/tuple.hpp.erb (modified) (1 diff)
• unpack.hpp (modified) (1 diff)

lang/c/msgpack/trunk/cpp/object.hpp

@@ -84 +84 @@
         
 
-namespace type {
-        template <typename T>
-        inline T& operator>> (object o, T& v)
-        {
-                v.msgpack_unpack(o);
-                return v;
-        }
-        
-        template <typename Stream, typename T>
-        inline packer<Stream>& operator<< (packer<Stream>& o, const T& v)
-        {
-                pack_copy(v.msgpack_pack(), o);
-                return o;
-        }
+template <typename T>
+inline T& operator>> (object o, T& v)
+{
+        v.msgpack_unpack(o);
+        return v;
+}
+
+template <typename Stream, typename T>
+inline packer<Stream>& operator<< (packer<Stream>& o, const T& v)
+{
+        o << v.msgpack_pack();
+        return o;
 }
 
@@ -104 +102 @@
 inline void convert(T& v, object o)
 {
-        using namespace type;
         o >> v;
 }
 
-
-template <typename Stream, typename T>
-inline void pack(T& v, packer<Stream>& o)
-{
-        using namespace type;
+template <typename Stream, typename T>
+inline void pack(packer<Stream>& o, const T& v)
+{
         o << v;
 }
 
-
-template <typename Stream, typename T>
-inline void pack(T& v, Stream& s)
+template <typename Stream, typename T>
+inline void pack(Stream& s, const T& v)
 {
         packer<Stream> pk(s);
-        pack(v, pk);
-}
-
-
-template <typename Stream, typename T>
-inline void pack_copy(T v, packer<Stream>& o)
-{
-        pack(v, o);
+        pack(pk, v);
+}
+
+template <typename Stream, typename T>
+inline void pack_copy(packer<Stream>& o, T v)
+{
+        pack(o, v);
 }
 

lang/c/msgpack/trunk/cpp/test.cpp

@@ -27 +27 @@
                         try {
                                 std::stringstream s;
-                                pack(should, s);
+                                pack(s, should);
                                 std::string str(s.str());
                                 object ro = unpack(str.data(), str.size(), m_zone);
@@ -140 +140 @@
         {
                 for(unsigned i=0; i < TASK_REPEAT; ++i) {
-                        pack(task, stream);
+                        pack(stream, task);
                 }
                 std::cout << "send " << stream.str().size() << " bytes" << std::endl;

lang/c/msgpack/trunk/cpp/type/array.hpp

@@ -46 +46 @@
         for(typename std::vector<T>::const_iterator it(v.begin()), it_end(v.end());
                         it != it_end; ++it) {
-                pack(*it, o);
+                pack(o, *it);
         }
         return o;

lang/c/msgpack/trunk/cpp/type/boolean.hpp

@@ -23 +23 @@
 
 namespace msgpack {
-namespace type {
 
 
 inline bool& operator>> (object o, bool& v)
 {
-        if(o.type != BOOLEAN) { throw type_error(); }
+        if(o.type != type::BOOLEAN) { throw type_error(); }
         v = o.via.boolean;
         return v;
@@ -43 +42 @@
 
 
-}  // namespace type
 }  // namespace msgpack
 

lang/c/msgpack/trunk/cpp/type/integer.hpp

@@ -71 +71 @@
         template <typename T, typename Stream>
         struct pack_integer_size_sign<T, Stream, 1, true> {
-                static inline void pack(T v, packer<Stream>& o)
+                static inline void pack(packer<Stream>& o, T v)
                         { o.pack_int8(v); }
         };
@@ -77 +77 @@
         template <typename T, typename Stream>
         struct pack_integer_size_sign<T, Stream, 1, false> {
-                static inline void pack(T v, packer<Stream>& o)
+                static inline void pack(packer<Stream>& o, T v)
                         { o.pack_uint8(v); }
         };
@@ -83 +83 @@
         template <typename T, typename Stream>
         struct pack_integer_size_sign<T, Stream, 2, true> {
-                static inline void pack(T v, packer<Stream>& o) {
+                static inline void pack(packer<Stream>& o, T v) {
                         if( (int16_t)v <= (int16_t)std::numeric_limits<int8_t>::max() &&
                                 (int16_t)v >= (int16_t)std::numeric_limits<int8_t>::min())
@@ -93 +93 @@
         template <typename T, typename Stream>
         struct pack_integer_size_sign<T, Stream, 2, false> {
-                static inline void pack(T v, packer<Stream>& o) {
+                static inline void pack(packer<Stream>& o, T v) {
                         if( (uint16_t)v <= (uint16_t)std::numeric_limits<uint8_t>::max())
                                 { o.pack_uint8(v); }
@@ -102 +102 @@
         template <typename T, typename Stream>
         struct pack_integer_size_sign<T, Stream, 4, true> {
-                static inline void pack(T v, packer<Stream>& o) {
+                static inline void pack(packer<Stream>& o, T v) {
                         if( (int32_t)v <= (int32_t)std::numeric_limits<int8_t>::max() &&
                                 (int32_t)v >= (int32_t)std::numeric_limits<int8_t>::min())
@@ -115 +115 @@
         template <typename T, typename Stream>
         struct pack_integer_size_sign<T, Stream, 4, false> {
-                static inline void pack(T v, packer<Stream>& o) {
+                static inline void pack(packer<Stream>& o, T v) {
                         if( (uint32_t)v <= (uint32_t)std::numeric_limits<uint8_t>::max())
                                 { o.pack_uint8(v); }
@@ -126 +126 @@
         template <typename T, typename Stream>
         struct pack_integer_size_sign<T, Stream, 8, true> {
-                static inline void pack(T v, packer<Stream>& o) {
+                static inline void pack(packer<Stream>& o, T v) {
                         if( (int64_t)v <= (int64_t)std::numeric_limits<int8_t>::max() &&
                                 (int64_t)v >= (int64_t)std::numeric_limits<int8_t>::min())
@@ -142 +142 @@
         template <typename T, typename Stream>
         struct pack_integer_size_sign<T, Stream, 8, false> {
-                static inline void pack(T v, packer<Stream>& o) {
+                static inline void pack(packer<Stream>& o, T v) {
                         if( (uint64_t)v <= (uint64_t)std::numeric_limits<uint8_t>::max())
                                 { o.pack_uint8(v); }
@@ -157 +157 @@
         static inline void pack_integer(T v, packer<Stream>& o)
         {
-                pack_integer_size_sign<T, Stream, sizeof(T), std::numeric_limits<T>::is_signed>::pack(v, o);
+                pack_integer_size_sign<T, Stream, sizeof(T), std::numeric_limits<T>::is_signed>::pack(o, v);
         }
 

lang/c/msgpack/trunk/cpp/type/map.hpp

@@ -64 +64 @@
         for(typename type::assoc_vector<K,V>::const_iterator it(v.begin()), it_end(v.end());
                         it != it_end; ++it) {
-                pack(it->first, o);
-                pack(it->second, o);
+                pack(o, it->first);
+                pack(o, it->second);
         }
         return o;
@@ -98 +98 @@
         for(typename std::map<K,V>::const_iterator it(v.begin()), it_end(v.end());
                         it != it_end; ++it) {
-                pack(it->first, o);
-                pack(it->second, o);
+                pack(o, it->first);
+                pack(o, it->second);
         }
         return o;
@@ -126 +126 @@
         for(typename std::multimap<K,V>::const_iterator it(v.begin()), it_end(v.end());
                         it != it_end; ++it) {
-                pack(it->first, o);
-                pack(it->second, o);
+                pack(o, it->first);
+                pack(o, it->second);
         }
         return o;

lang/c/msgpack/trunk/cpp/type/tuple.hpp.erb

@@ -143 +143 @@
         o.pack_array(<%=i+1%>);
         <%0.upto(i) {|j|%>
-        pack(v.template get<<%=j%>>(), o);<%}%>
+        pack(o, v.template get<<%=j%>>());<%}%>
         return o;
 }

lang/c/msgpack/trunk/cpp/unpack.hpp

@@ -82 +82 @@
         //     // 2.
         //     ssize_t bytes =
-        //         read(the_source, pac.buffer, pac.buffer_capacity());
+        //         read(the_source, pac.buffer(), pac.buffer_capacity());
         //
         //     // error handling ...