Changeset 18598

Timestamp:

09/02/08 00:07:12 (4 months ago)

Author:

frsyuki

Message:

lang/c/msgpack: uint64_t, int64_t support for ruby

Location:

lang/c/msgpack/trunk/ruby

Files:

• Makefile (deleted)
• pack.c (modified) (2 diffs)
• unpack_inline.c (modified) (3 diffs)

lang/c/msgpack/trunk/ruby/pack.c

@@ -63 +63 @@
 }
 
+
+#ifndef RBIGNUM_SIGN  // Ruby 1.8
+#define RBIGNUM_SIGN(b) (RBIGNUM(b)->sign)
+#endif
+
+static VALUE MessagePack_Bignum_to_msgpack(int argc, VALUE *argv, VALUE self)
+{
+        ARG_BUFFER(out, argc, argv);
+        // FIXME bignum
+        if(RBIGNUM_SIGN(self)) {  // positive
+                msgpack_pack_unsigned_int_64(out, rb_big2ull(self));
+        } else {  // negative
+                msgpack_pack_signed_int_64(out, rb_big2ll(self));
+        }
+        return out;
+}
+
 static VALUE MessagePack_Float_to_msgpack(int argc, VALUE *argv, VALUE self)
 {
@@ -123 +140 @@
         rb_define_method_id(rb_cFalseClass, s_to_msgpack, MessagePack_FalseClass_to_msgpack, -1);
         rb_define_method_id(rb_cFixnum, s_to_msgpack, MessagePack_Fixnum_to_msgpack, -1);
+        rb_define_method_id(rb_cBignum, s_to_msgpack, MessagePack_Bignum_to_msgpack, -1);
         rb_define_method_id(rb_cFloat,  s_to_msgpack, MessagePack_Float_to_msgpack, -1);
         rb_define_method_id(rb_cString, s_to_msgpack, MessagePack_String_to_msgpack, -1);

lang/c/msgpack/trunk/ruby/unpack_inline.c

@@ -31 +31 @@
 
 static inline VALUE msgpack_unpack_unsigned_int_64(msgpack_unpack_context* x, uint64_t d)
-{ return UINT2NUM(d); }  // FIXME
+{ return rb_ull2inum(d); }
 
 static inline VALUE msgpack_unpack_signed_int_8(msgpack_unpack_context* x, int8_t d)
@@ -43 +43 @@
 
 static inline VALUE msgpack_unpack_signed_int_64(msgpack_unpack_context* x, int64_t d)
-{ return INT2NUM(d); }  // FIXME
+{ return rb_ll2inum(d); }
 
 static inline VALUE msgpack_unpack_float(msgpack_unpack_context* x, float d)
@@ -64 +64 @@
 
 static inline void msgpack_unpack_array_item(msgpack_unpack_context* x, VALUE c, VALUE o)
-{ rb_ary_push(c, o); }
+{ rb_ary_push(c, o); }  // FIXME set value directry RARRAY_PTR(obj)[RARRAY_LEN(obj)++]
 
 static inline VALUE msgpack_unpack_map_start(msgpack_unpack_context* x, unsigned int n)