msgpack 0.4.6 → 0.4.7

data/ext/extconf.rb

@@ -1,5 +1,7 @@
 require 'mkmf'
 require './version.rb'
 $CFLAGS << %[ -I.. -Wall -O3 -DMESSAGEPACK_VERSION=\\"#{MessagePack::VERSION}\\" -g]
+have_header("ruby/st.h")
+have_header("st.h")
 create_makefile('msgpack')
 

data/ext/pack.c

@@ -15,6 +15,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
+#define RSTRING_NOT_MODIFIED
 #include "ruby.h"
 #include "compat.h"
 
@@ -39,8 +40,10 @@ static ID s_append;
 #include "msgpack/pack_template.h"
 
 
-#ifndef RUBY_VM
-#include "st.h"  // ruby hash
+#if defined(HAVE_RUBY_ST_H)
+#include "ruby/st.h"  // ruby hash on Ruby 1.9
+#elif defined(HAVE_ST_H)
+#include "st.h"       // ruby hash on Ruby 1.8
 #endif
 
 #define ARG_BUFFER(name, argc, argv) \
@@ -219,11 +222,12 @@ static VALUE MessagePack_Array_to_msgpack(int argc, VALUE *argv, VALUE self)
 {
 	ARG_BUFFER(out, argc, argv);
 	// FIXME check sizeof(long) > sizeof(unsigned int) && RARRAY_LEN(self) > UINT_MAX
-	msgpack_pack_array(out, (unsigned int)RARRAY_LEN(self));
-	VALUE* p = RARRAY_PTR(self);
-	VALUE* const pend = p + RARRAY_LEN(self);
-	for(;p != pend; ++p) {
-		rb_funcall(*p, s_to_msgpack, 1, out);
+	unsigned int ary_length = (unsigned int)RARRAY_LEN(self);
+	unsigned int i = 0;
+	msgpack_pack_array(out, ary_length);
+	for(; i < ary_length; ++i) {
+		VALUE p = rb_ary_entry(self, i);
+		rb_funcall(p, s_to_msgpack, 1, out);
 	}
 	return out;
 }

data/ext/unpack.c

@@ -112,7 +112,7 @@ static inline int template_callback_array(unpack_user* u, unsigned int n, VALUE*
 { *o = rb_ary_new2(n); return 0; }
 
 static inline int template_callback_array_item(unpack_user* u, VALUE* c, VALUE o)
-{ rb_ary_push(*c, o); return 0; }  // FIXME set value directry RARRAY_PTR(obj)[RARRAY_LEN(obj)++]
+{ rb_ary_push(*c, o); return 0; }
 
 static inline int template_callback_map(unpack_user* u, unsigned int n, VALUE* o)
 { *o = rb_hash_new(); return 0; }

data/ext/version.rb

@@ -1,3 +1,3 @@
 module MessagePack
-	VERSION = "0.4.6"
+	VERSION = "0.4.7"
 end

data/msgpack/pack_template.h

@@ -646,7 +646,12 @@ msgpack_pack_inline_func(_double)(msgpack_pack_user x, double d)
 	union { double f; uint64_t i; } mem;
 	mem.f = d;
 	unsigned char buf[9];
-	buf[0] = 0xcb; _msgpack_store64(&buf[1], mem.i);
+	buf[0] = 0xcb;
+#if defined(__arm__) && !(__ARM_EABI__) // arm-oabi
+    // https://github.com/msgpack/msgpack-perl/pull/1
+    mem.i = (mem.i & 0xFFFFFFFFUL) << 32UL | (mem.i >> 32UL);
+#endif
+    _msgpack_store64(&buf[1], mem.i);
 	msgpack_pack_append_buffer(x, buf, 9);
 }
 

data/msgpack/sysdep.h

@@ -153,24 +153,24 @@ typedef unsigned int _msgpack_atomic_counter_t;
 #define _msgpack_be64(x) (x)
 
 #define _msgpack_load16(cast, from) ((cast)( \
-        (((uint16_t)((uint8_t*)from)[1]) << 8) | \
-        (((uint16_t)((uint8_t*)from)[0])     ) ))
+        (((uint16_t)((uint8_t*)from)[0]) << 8) | \
+        (((uint16_t)((uint8_t*)from)[1])     ) ))
 
 #define _msgpack_load32(cast, from) ((cast)( \
-        (((uint32_t)((uint8_t*)from)[3]) << 24) | \
-        (((uint32_t)((uint8_t*)from)[2]) << 16) | \
-        (((uint32_t)((uint8_t*)from)[1]) <<  8) | \
-        (((uint32_t)((uint8_t*)from)[0])      ) ))
+        (((uint32_t)((uint8_t*)from)[0]) << 24) | \
+        (((uint32_t)((uint8_t*)from)[1]) << 16) | \
+        (((uint32_t)((uint8_t*)from)[2]) <<  8) | \
+        (((uint32_t)((uint8_t*)from)[3])      ) ))
 
 #define _msgpack_load64(cast, from) ((cast)( \
-        (((uint64_t)((uint8_t*)from)[7]) << 56) | \
-        (((uint64_t)((uint8_t*)from)[6]) << 48) | \
-        (((uint64_t)((uint8_t*)from)[5]) << 40) | \
-        (((uint64_t)((uint8_t*)from)[4]) << 32) | \
-        (((uint64_t)((uint8_t*)from)[3]) << 24) | \
-        (((uint64_t)((uint8_t*)from)[2]) << 16) | \
-        (((uint64_t)((uint8_t*)from)[1]) << 8)  | \
-        (((uint64_t)((uint8_t*)from)[0])     )  ))
+        (((uint64_t)((uint8_t*)from)[0]) << 56) | \
+        (((uint64_t)((uint8_t*)from)[1]) << 48) | \
+        (((uint64_t)((uint8_t*)from)[2]) << 40) | \
+        (((uint64_t)((uint8_t*)from)[3]) << 32) | \
+        (((uint64_t)((uint8_t*)from)[4]) << 24) | \
+        (((uint64_t)((uint8_t*)from)[5]) << 16) | \
+        (((uint64_t)((uint8_t*)from)[6]) << 8)  | \
+        (((uint64_t)((uint8_t*)from)[7])     )  ))
 #endif
 
 

data/msgpack/unpack_template.h

@@ -263,6 +263,10 @@ msgpack_unpack_func(int, _execute)(msgpack_unpack_struct(_context)* ctx, const c
 			case CS_DOUBLE: {
 					union { uint64_t i; double f; } mem;
 					mem.i = _msgpack_load64(uint64_t,n);
+#if defined(__arm__) && !(__ARM_EABI__) // arm-oabi
+                    // https://github.com/msgpack/msgpack-perl/pull/1
+                    mem.i = (mem.i & 0xFFFFFFFFUL) << 32UL | (mem.i >> 32UL);
+#endif
 					push_fixed_value(_double, mem.f); }
 			case CS_UINT_8:
 				push_fixed_value(_uint8, *(uint8_t*)n);

metadata

@@ -1,33 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: msgpack
-version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 6
-  version: 0.4.6
+version: !ruby/object:Gem::Version
+  version: 0.4.7
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - FURUHASHI Sadayuki
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-09 00:00:00 +09:00
-default_executable: 
+date: 2012-05-06 00:00:00.000000000Z
 dependencies: []
-
 description: 
 email: frsyuki@users.sourceforge.jp
 executables: []
-
-extensions: 
+extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - ext/compat.h
 - ext/extconf.rb
 - ext/pack.c
@@ -48,42 +38,34 @@ files:
 - test/test_encoding.rb
 - test/test_helper.rb
 - test/test_pack_unpack.rb
-has_rdoc: true
 homepage: http://msgpack.org/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - ext
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: msgpack
-rubygems_version: 1.3.7
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: MessagePack, a binary-based efficient data interchange format.
-test_files: 
+test_files:
 - test/test_cases.rb
 - test/test_encoding.rb
 - test/test_helper.rb
 - test/test_pack_unpack.rb
+has_rdoc: true