msgpack 0.4.4 → 0.4.5

data/ext/compat.h

@@ -28,46 +28,68 @@ extern int s_enc_usascii;
 extern VALUE s_enc_utf8_value;
 #endif
 
-#ifdef RUBY_VM
+/* MRI 1.9 */
+#if defined(RUBY_VM)
 #define COMPAT_RERAISE rb_exc_raise(rb_errinfo())
+
+/* JRuby */
+#elif defined(JRUBY)
+#define COMPAT_RERAISE rb_exc_raise(rb_gv_get("$!"))
+
+/* MRI 1.8 and Rubinius */
 #else
 #define COMPAT_RERAISE rb_exc_raise(ruby_errinfo)
 #endif
 
 
-/* ruby 1.8 and Rubinius */
 #ifndef RBIGNUM_POSITIVE_P
-# ifdef RUBINIUS
-#  define RBIGNUM_POSITIVE_P(b) (rb_funcall(b, rb_intern(">="), 1, INT2FIX(0)) == Qtrue)
-# else
-#  define RBIGNUM_POSITIVE_P(b) (RBIGNUM(b)->sign)
-# endif
+
+/* Rubinius */
+#if defined(RUBINIUS)
+#define RBIGNUM_POSITIVE_P(b) (rb_funcall(b, rb_intern(">="), 1, INT2FIX(0)) == Qtrue)
+
+/* JRuby */
+#elif defined(JRUBY)
+#define RBIGNUM_POSITIVE_P(b) (rb_funcall(b, rb_intern(">="), 1, INT2FIX(0)) == Qtrue)
+#define rb_big2ull(b) rb_num2ull(b)
+/*#define rb_big2ll(b) rb_num2ll(b)*/
+
+/* MRI 1.8 */
+#else
+#define RBIGNUM_POSITIVE_P(b) (RBIGNUM(b)->sign)
+
+#endif
 #endif
 
 
 /* Rubinius */
-#ifdef RUBINIUS
+#if defined(RUBINIUS)
+static inline void rb_gc_enable() { return; }
+static inline void rb_gc_disable() { return; }
+
+/* JRuby */
+#elif defined(JRUBY)
 static inline void rb_gc_enable() { return; }
 static inline void rb_gc_disable() { return; }
 #endif
 
 
-/* ruby 1.8.5 */
+/* MRI 1.8.5 */
 #ifndef RSTRING_PTR
 #define RSTRING_PTR(s) (RSTRING(s)->ptr)
 #endif
 
-/* ruby 1.8.5 */
+/* MRI 1.8.5 */
 #ifndef RSTRING_LEN
 #define RSTRING_LEN(s) (RSTRING(s)->len)
 #endif
 
-/* ruby 1.8.5 */
+/* MRI 1.8.5 */
 #ifndef RARRAY_PTR
 #define RARRAY_PTR(s) (RARRAY(s)->ptr)
 #endif
 
-/* ruby 1.8.5 */
+/* MRI 1.8.5 */
 #ifndef RARRAY_LEN
 #define RARRAY_LEN(s) (RARRAY(s)->len)
 #endif

data/ext/pack.c

@@ -113,7 +113,11 @@ static VALUE MessagePack_FalseClass_to_msgpack(int argc, VALUE *argv, VALUE self
 static VALUE MessagePack_Fixnum_to_msgpack(int argc, VALUE *argv, VALUE self)
 {
 	ARG_BUFFER(out, argc, argv);
+#ifdef JRUBY
+	msgpack_pack_long(out, FIXNUM_P(self) ? FIX2LONG(self) : rb_num2ll(self));
+#else
 	msgpack_pack_long(out, FIX2LONG(self));
+#endif
 	return out;
 }
 

data/ext/unpack.c

@@ -594,14 +594,6 @@ static VALUE MessagePack_Unpacker_each(VALUE self)
 	return Qnil;
 }
 
-/**
- * Document-method: MessagePack::Unpacker#feed_each
- *
- * call-seq:
- *   unpacker.feed_each(data) {|object| }
- *
- * Same as feed(data) + each {|object| }, but tries to avoid copying of the buffer.
- */
 static VALUE feed_each_impl(VALUE args)
 {
 	VALUE self = ((VALUE*)args)[0];
@@ -700,6 +692,14 @@ static VALUE feed_each_ensure(VALUE args) {
 	return Qnil;
 }
 
+/**
+ * Document-method: MessagePack::Unpacker#feed_each
+ *
+ * call-seq:
+ *   unpacker.feed_each(data) {|object| }
+ *
+ * Same as feed(data) + each {|object| }, but tries to avoid copying of the buffer.
+ */
 static VALUE MessagePack_Unpacker_feed_each(VALUE self, VALUE data)
 {
 	size_t consumed = 0;

data/ext/version.rb

@@ -1,3 +1,3 @@
 module MessagePack
-	VERSION = "0.4.4"
+	VERSION = "0.4.5"
 end

data/msgpack/sysdep.h

@@ -38,6 +38,7 @@ typedef unsigned __int64 uint64_t;
 
 
 #ifdef _WIN32
+#define _msgpack_atomic_counter_header <windows.h>
 typedef long _msgpack_atomic_counter_t;
 #define _msgpack_sync_decr_and_fetch(ptr) InterlockedDecrement(ptr)
 #define _msgpack_sync_incr_and_fetch(ptr) InterlockedIncrement(ptr)
@@ -49,7 +50,6 @@ typedef unsigned int _msgpack_atomic_counter_t;
 
 
 #ifdef _WIN32
-#include <winsock2.h>
 
 #ifdef __cplusplus
 /* numeric_limits<T>::min,max */
@@ -70,15 +70,45 @@ typedef unsigned int _msgpack_atomic_counter_t;
 #define __LITTLE_ENDIAN__
 #elif __BYTE_ORDER == __BIG_ENDIAN
 #define __BIG_ENDIAN__
+#elif _WIN32
+#define __LITTLE_ENDIAN__
 #endif
 #endif
 
+
 #ifdef __LITTLE_ENDIAN__
 
-#define _msgpack_be16(x) ntohs(x)
-#define _msgpack_be32(x) ntohl(x)
+#ifdef _WIN32
+#  if defined(ntohs)
+#    define _msgpack_be16(x) ntohs(x)
+#  elif defined(_byteswap_ushort) || (defined(_MSC_VER) && _MSC_VER >= 1400)
+#    define _msgpack_be16(x) ((uint16_t)_byteswap_ushort((unsigned short)x))
+#  else
+#    define _msgpack_be16(x) \
+		( ((((uint16_t)x) <<  8) ) | \
+		  ((((uint16_t)x) >>  8) ) )
+#  endif
+#else
+#  define _msgpack_be16(x) ntohs(x)
+#endif
+
+#ifdef _WIN32
+#  if defined(ntohl)
+#    define _msgpack_be32(x) ntohl(x)
+#  elif defined(_byteswap_ulong) || (defined(_MSC_VER) && _MSC_VER >= 1400)
+#    define _msgpack_be32(x) ((uint32_t)_byteswap_ulong((unsigned long)x))
+#  else
+#    define _msgpack_be32(x) \
+		( ((((uint32_t)x) << 24)               ) | \
+		  ((((uint32_t)x) <<  8) & 0x00ff0000U ) | \
+		  ((((uint32_t)x) >>  8) & 0x0000ff00U ) | \
+		  ((((uint32_t)x) >> 24)               ) )
+#  endif
+#else
+#  define _msgpack_be32(x) ntohl(x)
+#endif
 
-#if defined(_byteswap_uint64) || _MSC_VER >= 1400
+#if defined(_byteswap_uint64) || (defined(_MSC_VER) && _MSC_VER >= 1400)
 #  define _msgpack_be64(x) (_byteswap_uint64(x))
 #elif defined(bswap_64)
 #  define _msgpack_be64(x) bswap_64(x)
@@ -86,14 +116,14 @@ typedef unsigned int _msgpack_atomic_counter_t;
 #  define _msgpack_be64(x) __DARWIN_OSSwapInt64(x)
 #else
 #define _msgpack_be64(x) \
-	( ((((uint64_t)x) << 56) & 0xff00000000000000ULL ) | \
+	( ((((uint64_t)x) << 56)                         ) | \
 	  ((((uint64_t)x) << 40) & 0x00ff000000000000ULL ) | \
 	  ((((uint64_t)x) << 24) & 0x0000ff0000000000ULL ) | \
 	  ((((uint64_t)x) <<  8) & 0x000000ff00000000ULL ) | \
 	  ((((uint64_t)x) >>  8) & 0x00000000ff000000ULL ) | \
 	  ((((uint64_t)x) >> 24) & 0x0000000000ff0000ULL ) | \
 	  ((((uint64_t)x) >> 40) & 0x000000000000ff00ULL ) | \
-	  ((((uint64_t)x) >> 56) & 0x00000000000000ffULL ) )
+	  ((((uint64_t)x) >> 56)                         ) )
 #endif
 
 #else
@@ -104,11 +134,11 @@ typedef unsigned int _msgpack_atomic_counter_t;
 
 
 #define _msgpack_store16(to, num) \
-	do { uint16_t val = _msgpack_be16(num); memcpy(to, &val, 2); } while(0);
+	do { uint16_t val = _msgpack_be16(num); memcpy(to, &val, 2); } while(0)
 #define _msgpack_store32(to, num) \
-	do { uint32_t val = _msgpack_be32(num); memcpy(to, &val, 4); } while(0);
+	do { uint32_t val = _msgpack_be32(num); memcpy(to, &val, 4); } while(0)
 #define _msgpack_store64(to, num) \
-	do { uint64_t val = _msgpack_be64(num); memcpy(to, &val, 8); } while(0);
+	do { uint64_t val = _msgpack_be64(num); memcpy(to, &val, 8); } while(0)
 
 
 #define _msgpack_load16(cast, from) ((cast)_msgpack_be16(*(uint16_t*)from))

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: msgpack
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 4
-  - 4
-  version: 0.4.4
+  - 5
+  version: 0.4.5
 platform: ruby
 authors: 
 - FURUHASHI Sadayuki
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-28 00:00:00 +09:00
+date: 2011-05-09 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -28,29 +28,26 @@ extensions:
 extra_rdoc_files: []
 
 files: 
-- ext/compat.h
 - ext/extconf.rb
-- ext/pack.c
 - ext/pack.h
-- ext/rbinit.c
 - ext/unpack.c
+- ext/pack.c
+- ext/compat.h
 - ext/unpack.h
+- ext/rbinit.c
 - ext/version.rb
-- msgpack/pack_define.h
 - msgpack/pack_template.h
+- msgpack/pack_define.h
 - msgpack/sysdep.h
 - msgpack/unpack_define.h
 - msgpack/unpack_template.h
-- test/cases.json
+- test/test_pack_unpack.rb
+- test/test_helper.rb
+- test/test_encoding.rb
+- test/test_cases.rb
 - test/cases.mpac
+- test/cases.json
 - test/cases_compact.mpac
-- test/test_cases.rb
-- test/test_cases.rbc
-- test/test_encoding.rb
-- test/test_helper.rb
-- test/test_helper.rbc
-- test/test_pack_unpack.rb
-- test/test_pack_unpack.rbc
 has_rdoc: true
 homepage: http://msgpack.sourceforge.net/
 licenses: []
@@ -86,7 +83,7 @@ signing_key:
 specification_version: 3
 summary: MessagePack, a binary-based efficient data interchange format.
 test_files: 
-- test/test_cases.rb
-- test/test_encoding.rb
-- test/test_helper.rb
 - test/test_pack_unpack.rb
+- test/test_helper.rb
+- test/test_encoding.rb
+- test/test_cases.rb

data/test/test_cases.rbc

@@ -1,1152 +0,0 @@
-!RBIX
-0
-x
-M
-1
-n
-n
-x
-10
-__script__
-i
-180
-45
-0
-1
-65
-49
-2
-0
-49
-3
-1
-19
-0
-15
-5
-20
-0
-47
-49
-4
-0
-7
-5
-63
-2
-47
-49
-6
-1
-15
-26
-93
-0
-15
-29
-47
-0
-5
-7
-7
-64
-47
-49
-6
-1
-30
-8
-90
-26
-93
-1
-15
-24
-13
-45
-8
-9
-12
-49
-10
-1
-10
-64
-8
-85
-15
-5
-7
-11
-64
-47
-49
-6
-1
-15
-5
-7
-7
-64
-47
-49
-6
-1
-25
-8
-90
-15
-92
-1
-27
-34
-92
-0
-27
-15
-65
-7
-12
-20
-0
-47
-49
-4
-0
-7
-13
-63
-2
-49
-14
-2
-15
-65
-7
-15
-20
-0
-47
-49
-4
-0
-7
-16
-63
-2
-49
-14
-2
-15
-65
-7
-17
-20
-0
-47
-49
-4
-0
-7
-18
-63
-2
-49
-14
-2
-15
-99
-7
-19
-45
-20
-21
-43
-22
-43
-23
-65
-49
-24
-3
-13
-99
-12
-7
-25
-12
-7
-26
-12
-65
-12
-49
-27
-4
-15
-49
-25
-0
-15
-2
-11
-I
-9
-I
-1
-I
-0
-I
-0
-n
-p
-28
-x
-4
-File
-n
-x
-11
-active_path
-x
-7
-dirname
-x
-4
-to_s
-s
-12
-/test_helper
-x
-7
-require
-s
-4
-json
-x
-9
-LoadError
-n
-x
-3
-===
-s
-8
-rubygems
-x
-10
-CASES_PATH
-s
-11
-/cases.mpac
-x
-9
-const_set
-x
-18
-CASES_COMPACT_PATH
-s
-19
-/cases_compact.mpac
-x
-15
-CASES_JSON_PATH
-s
-11
-/cases.json
-x
-20
-MessagePackTestCases
-x
-4
-Test
-n
-x
-4
-Unit
-x
-8
-TestCase
-x
-10
-open_class
-x
-14
-__class_init__
-M
-1
-n
-n
-x
-20
-MessagePackTestCases
-i
-44
-5
-66
-99
-7
-0
-7
-1
-65
-67
-49
-2
-0
-49
-3
-4
-15
-99
-7
-4
-7
-5
-65
-67
-49
-2
-0
-49
-3
-4
-15
-99
-7
-6
-7
-7
-65
-67
-49
-2
-0
-49
-3
-4
-11
-I
-5
-I
-0
-I
-0
-I
-0
-n
-p
-8
-x
-9
-feed_file
-M
-1
-n
-n
-x
-9
-feed_file
-i
-46
-45
-0
-1
-43
-2
-13
-71
-3
-47
-9
-23
-47
-49
-4
-0
-13
-47
-49
-5
-0
-15
-8
-26
-49
-3
-0
-19
-1
-15
-20
-1
-45
-6
-7
-20
-0
-49
-8
-1
-49
-9
-1
-15
-20
-1
-11
-I
-5
-I
-2
-I
-1
-I
-1
-n
-p
-10
-x
-11
-MessagePack
-n
-x
-8
-Unpacker
-x
-3
-new
-x
-8
-allocate
-x
-10
-initialize
-x
-4
-File
-n
-x
-4
-read
-x
-4
-feed
-p
-9
-I
-0
-I
-11
-I
-0
-I
-12
-I
-1d
-I
-13
-I
-2b
-I
-14
-I
-2e
-x
-54
-/Users/frsyuki/project/msgpack/ruby/test/test_cases.rb
-p
-2
-x
-4
-path
-x
-3
-pac
-x
-17
-method_visibility
-x
-15
-add_defn_method
-x
-20
-test_compare_compact
-M
-1
-n
-n
-x
-20
-test_compare_compact
-i
-61
-5
-45
-0
-1
-47
-49
-2
-1
-19
-0
-15
-5
-45
-3
-4
-47
-49
-2
-1
-19
-1
-15
-35
-0
-19
-2
-15
-20
-0
-56
-5
-50
-6
-0
-15
-35
-0
-19
-3
-15
-20
-1
-56
-7
-50
-6
-0
-15
-20
-2
-20
-3
-49
-8
-1
-56
-9
-50
-6
-0
-11
-I
-6
-I
-4
-I
-0
-I
-0
-n
-p
-10
-x
-10
-CASES_PATH
-n
-x
-9
-feed_file
-x
-18
-CASES_COMPACT_PATH
-n
-M
-1
-p
-2
-x
-9
-for_block
-t
-n
-x
-20
-test_compare_compact
-i
-13
-57
-19
-0
-15
-21
-1
-2
-20
-0
-49
-0
-1
-11
-I
-4
-I
-1
-I
-1
-I
-1
-n
-p
-1
-x
-2
-<<
-p
-3
-I
-0
-I
-1b
-I
-d
-x
-54
-/Users/frsyuki/project/msgpack/ruby/test/test_cases.rb
-p
-1
-x
-3
-obj
-x
-4
-each
-M
-1
-p
-2
-x
-9
-for_block
-t
-n
-x
-20
-test_compare_compact
-i
-13
-57
-19
-0
-15
-21
-1
-3
-20
-0
-49
-0
-1
-11
-I
-4
-I
-1
-I
-1
-I
-1
-n
-p
-1
-x
-2
-<<
-p
-3
-I
-0
-I
-1c
-I
-d
-x
-54
-/Users/frsyuki/project/msgpack/ruby/test/test_cases.rb
-p
-1
-x
-4
-cobj
-x
-3
-zip
-M
-1
-p
-2
-x
-9
-for_block
-t
-n
-x
-20
-test_compare_compact
-i
-21
-58
-36
-37
-19
-0
-15
-37
-19
-1
-15
-15
-5
-20
-0
-20
-1
-47
-49
-0
-2
-11
-I
-6
-I
-2
-I
-2
-I
-2
-n
-p
-1
-x
-12
-assert_equal
-p
-5
-I
-0
-I
-1e
-I
-b
-I
-1f
-I
-15
-x
-54
-/Users/frsyuki/project/msgpack/ruby/test/test_cases.rb
-p
-2
-x
-3
-obj
-x
-4
-cobj
-p
-13
-I
-0
-I
-17
-I
-0
-I
-18
-I
-b
-I
-19
-I
-16
-I
-1b
-I
-23
-I
-1c
-I
-30
-I
-1e
-I
-3d
-x
-54
-/Users/frsyuki/project/msgpack/ruby/test/test_cases.rb
-p
-4
-x
-3
-pac
-x
-4
-cpac
-x
-4
-objs
-x
-5
-cobjs
-x
-17
-test_compare_json
-M
-1
-n
-n
-x
-17
-test_compare_json
-i
-52
-5
-45
-0
-1
-47
-49
-2
-1
-19
-0
-15
-35
-0
-19
-1
-15
-20
-0
-56
-3
-50
-4
-0
-15
-45
-5
-6
-45
-7
-8
-45
-9
-10
-49
-11
-1
-49
-12
-1
-19
-2
-15
-20
-1
-20
-2
-56
-13
-50
-14
-1
-11
-I
-6
-I
-3
-I
-0
-I
-0
-n
-p
-15
-x
-10
-CASES_PATH
-n
-x
-9
-feed_file
-M
-1
-p
-2
-x
-9
-for_block
-t
-n
-x
-17
-test_compare_json
-i
-13
-57
-19
-0
-15
-21
-1
-1
-20
-0
-49
-0
-1
-11
-I
-4
-I
-1
-I
-1
-I
-1
-n
-p
-1
-x
-2
-<<
-p
-3
-I
-0
-I
-26
-I
-d
-x
-54
-/Users/frsyuki/project/msgpack/ruby/test/test_cases.rb
-p
-1
-x
-3
-obj
-x
-4
-each
-x
-4
-JSON
-n
-x
-4
-File
-n
-x
-15
-CASES_JSON_PATH
-n
-x
-4
-read
-x
-4
-load
-M
-1
-p
-2
-x
-9
-for_block
-t
-n
-x
-17
-test_compare_json
-i
-21
-58
-36
-37
-19
-0
-15
-37
-19
-1
-15
-15
-5
-20
-0
-20
-1
-47
-49
-0
-2
-11
-I
-6
-I
-2
-I
-2
-I
-2
-n
-p
-1
-x
-12
-assert_equal
-p
-5
-I
-0
-I
-29
-I
-b
-I
-2a
-I
-15
-x
-54
-/Users/frsyuki/project/msgpack/ruby/test/test_cases.rb
-p
-2
-x
-3
-obj
-x
-4
-jobj
-x
-3
-zip
-p
-11
-I
-0
-I
-23
-I
-0
-I
-24
-I
-b
-I
-26
-I
-18
-I
-27
-I
-2a
-I
-29
-I
-34
-x
-54
-/Users/frsyuki/project/msgpack/ruby/test/test_cases.rb
-p
-3
-x
-3
-pac
-x
-4
-objs
-x
-5
-jobjs
-p
-7
-I
-2
-I
-11
-I
-10
-I
-17
-I
-1e
-I
-23
-I
-2c
-x
-54
-/Users/frsyuki/project/msgpack/ruby/test/test_cases.rb
-p
-0
-x
-13
-attach_method
-p
-21
-I
-0
-I
-2
-I
-d
-I
-3
-I
-1d
-I
-6
-I
-34
-I
-7
-I
-41
-I
-8
-I
-4a
-I
-9
-I
-5e
-I
-c
-I
-6f
-I
-d
-I
-80
-I
-e
-I
-91
-I
-10
-I
-b4
-x
-54
-/Users/frsyuki/project/msgpack/ruby/test/test_cases.rb
-p
-1
-x
-4
-here