msgpack 0.4.3-mswin32 → 0.4.4-mswin32

data/ext/version.rb

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

data/msgpack/pack_template.h

@@ -69,7 +69,7 @@ do { \
 	} else { \
 		/* unsigned 16 */ \
 		unsigned char buf[3]; \
-		buf[0] = 0xcd; _msgpack_store16(&buf[1], d); \
+		buf[0] = 0xcd; _msgpack_store16(&buf[1], (uint16_t)d); \
 		msgpack_pack_append_buffer(x, buf, 3); \
 	} \
 } while(0)
@@ -89,12 +89,12 @@ do { \
 		if(d < (1<<16)) { \
 			/* unsigned 16 */ \
 			unsigned char buf[3]; \
-			buf[0] = 0xcd; _msgpack_store16(&buf[1], d); \
+			buf[0] = 0xcd; _msgpack_store16(&buf[1], (uint16_t)d); \
 			msgpack_pack_append_buffer(x, buf, 3); \
 		} else { \
 			/* unsigned 32 */ \
 			unsigned char buf[5]; \
-			buf[0] = 0xce; _msgpack_store32(&buf[1], d); \
+			buf[0] = 0xce; _msgpack_store32(&buf[1], (uint32_t)d); \
 			msgpack_pack_append_buffer(x, buf, 5); \
 		} \
 	} \
@@ -103,7 +103,7 @@ do { \
 #define msgpack_pack_real_uint64(x, d) \
 do { \
 	if(d < (1ULL<<8)) { \
-		if(d < (1<<7)) { \
+		if(d < (1ULL<<7)) { \
 			/* fixnum */ \
 			msgpack_pack_append_buffer(x, &TAKE8_64(d), 1); \
 		} else { \
@@ -115,12 +115,12 @@ do { \
 		if(d < (1ULL<<16)) { \
 			/* unsigned 16 */ \
 			unsigned char buf[3]; \
-			buf[0] = 0xcd; _msgpack_store16(&buf[1], d); \
+			buf[0] = 0xcd; _msgpack_store16(&buf[1], (uint16_t)d); \
 			msgpack_pack_append_buffer(x, buf, 3); \
 		} else if(d < (1ULL<<32)) { \
 			/* unsigned 32 */ \
 			unsigned char buf[5]; \
-			buf[0] = 0xce; _msgpack_store32(&buf[1], d); \
+			buf[0] = 0xce; _msgpack_store32(&buf[1], (uint32_t)d); \
 			msgpack_pack_append_buffer(x, buf, 5); \
 		} else { \
 			/* unsigned 64 */ \
@@ -149,7 +149,7 @@ do { \
 		if(d < -(1<<7)) { \
 			/* signed 16 */ \
 			unsigned char buf[3]; \
-			buf[0] = 0xd1; _msgpack_store16(&buf[1], d); \
+			buf[0] = 0xd1; _msgpack_store16(&buf[1], (int16_t)d); \
 			msgpack_pack_append_buffer(x, buf, 3); \
 		} else { \
 			/* signed 8 */ \
@@ -167,7 +167,7 @@ do { \
 		} else { \
 			/* unsigned 16 */ \
 			unsigned char buf[3]; \
-			buf[0] = 0xcd; _msgpack_store16(&buf[1], d); \
+			buf[0] = 0xcd; _msgpack_store16(&buf[1], (uint16_t)d); \
 			msgpack_pack_append_buffer(x, buf, 3); \
 		} \
 	} \
@@ -179,12 +179,12 @@ do { \
 		if(d < -(1<<15)) { \
 			/* signed 32 */ \
 			unsigned char buf[5]; \
-			buf[0] = 0xd2; _msgpack_store32(&buf[1], d); \
+			buf[0] = 0xd2; _msgpack_store32(&buf[1], (int32_t)d); \
 			msgpack_pack_append_buffer(x, buf, 5); \
 		} else if(d < -(1<<7)) { \
 			/* signed 16 */ \
 			unsigned char buf[3]; \
-			buf[0] = 0xd1; _msgpack_store16(&buf[1], d); \
+			buf[0] = 0xd1; _msgpack_store16(&buf[1], (int16_t)d); \
 			msgpack_pack_append_buffer(x, buf, 3); \
 		} else { \
 			/* signed 8 */ \
@@ -202,12 +202,12 @@ do { \
 		} else if(d < (1<<16)) { \
 			/* unsigned 16 */ \
 			unsigned char buf[3]; \
-			buf[0] = 0xcd; _msgpack_store16(&buf[1], d); \
+			buf[0] = 0xcd; _msgpack_store16(&buf[1], (uint16_t)d); \
 			msgpack_pack_append_buffer(x, buf, 3); \
 		} else { \
 			/* unsigned 32 */ \
 			unsigned char buf[5]; \
-			buf[0] = 0xce; _msgpack_store32(&buf[1], d); \
+			buf[0] = 0xce; _msgpack_store32(&buf[1], (uint32_t)d); \
 			msgpack_pack_append_buffer(x, buf, 5); \
 		} \
 	} \
@@ -225,14 +225,14 @@ do { \
 			} else { \
 				/* signed 32 */ \
 				unsigned char buf[5]; \
-				buf[0] = 0xd2; _msgpack_store32(&buf[1], d); \
+				buf[0] = 0xd2; _msgpack_store32(&buf[1], (int32_t)d); \
 				msgpack_pack_append_buffer(x, buf, 5); \
 			} \
 		} else { \
 			if(d < -(1<<7)) { \
 				/* signed 16 */ \
 				unsigned char buf[3]; \
-				buf[0] = 0xd1; _msgpack_store16(&buf[1], d); \
+				buf[0] = 0xd1; _msgpack_store16(&buf[1], (int16_t)d); \
 				msgpack_pack_append_buffer(x, buf, 3); \
 			} else { \
 				/* signed 8 */ \
@@ -252,14 +252,14 @@ do { \
 			} else { \
 				/* unsigned 16 */ \
 				unsigned char buf[3]; \
-				buf[0] = 0xcd; _msgpack_store16(&buf[1], d); \
+				buf[0] = 0xcd; _msgpack_store16(&buf[1], (uint16_t)d); \
 				msgpack_pack_append_buffer(x, buf, 3); \
 			} \
 		} else { \
 			if(d < (1LL<<32)) { \
 				/* unsigned 32 */ \
 				unsigned char buf[5]; \
-				buf[0] = 0xce; _msgpack_store32(&buf[1], d); \
+				buf[0] = 0xce; _msgpack_store32(&buf[1], (uint32_t)d); \
 				msgpack_pack_append_buffer(x, buf, 5); \
 			} else { \
 				/* unsigned 64 */ \
@@ -272,63 +272,63 @@ do { \
 } while(0)
 
 
-#ifdef msgpack_pack_inline_func_fastint
+#ifdef msgpack_pack_inline_func_fixint
 
-msgpack_pack_inline_func_fastint(_uint8)(msgpack_pack_user x, uint8_t d)
+msgpack_pack_inline_func_fixint(_uint8)(msgpack_pack_user x, uint8_t d)
 {
 	unsigned char buf[2] = {0xcc, TAKE8_8(d)};
 	msgpack_pack_append_buffer(x, buf, 2);
 }
 
-msgpack_pack_inline_func_fastint(_uint16)(msgpack_pack_user x, uint16_t d)
+msgpack_pack_inline_func_fixint(_uint16)(msgpack_pack_user x, uint16_t d)
 {
 	unsigned char buf[3];
 	buf[0] = 0xcd; _msgpack_store16(&buf[1], d);
 	msgpack_pack_append_buffer(x, buf, 3);
 }
 
-msgpack_pack_inline_func_fastint(_uint32)(msgpack_pack_user x, uint32_t d)
+msgpack_pack_inline_func_fixint(_uint32)(msgpack_pack_user x, uint32_t d)
 {
 	unsigned char buf[5];
 	buf[0] = 0xce; _msgpack_store32(&buf[1], d);
 	msgpack_pack_append_buffer(x, buf, 5);
 }
 
-msgpack_pack_inline_func_fastint(_uint64)(msgpack_pack_user x, uint64_t d)
+msgpack_pack_inline_func_fixint(_uint64)(msgpack_pack_user x, uint64_t d)
 {
 	unsigned char buf[9];
 	buf[0] = 0xcf; _msgpack_store64(&buf[1], d);
 	msgpack_pack_append_buffer(x, buf, 9);
 }
 
-msgpack_pack_inline_func_fastint(_int8)(msgpack_pack_user x, int8_t d)
+msgpack_pack_inline_func_fixint(_int8)(msgpack_pack_user x, int8_t d)
 {
 	unsigned char buf[2] = {0xd0, TAKE8_8(d)};
 	msgpack_pack_append_buffer(x, buf, 2);
 }
 
-msgpack_pack_inline_func_fastint(_int16)(msgpack_pack_user x, int16_t d)
+msgpack_pack_inline_func_fixint(_int16)(msgpack_pack_user x, int16_t d)
 {
 	unsigned char buf[3];
 	buf[0] = 0xd1; _msgpack_store16(&buf[1], d);
 	msgpack_pack_append_buffer(x, buf, 3);
 }
 
-msgpack_pack_inline_func_fastint(_int32)(msgpack_pack_user x, int32_t d)
+msgpack_pack_inline_func_fixint(_int32)(msgpack_pack_user x, int32_t d)
 {
 	unsigned char buf[5];
 	buf[0] = 0xd2; _msgpack_store32(&buf[1], d);
 	msgpack_pack_append_buffer(x, buf, 5);
 }
 
-msgpack_pack_inline_func_fastint(_int64)(msgpack_pack_user x, int64_t d)
+msgpack_pack_inline_func_fixint(_int64)(msgpack_pack_user x, int64_t d)
 {
 	unsigned char buf[9];
 	buf[0] = 0xd3; _msgpack_store64(&buf[1], d);
 	msgpack_pack_append_buffer(x, buf, 9);
 }
 
-#undef msgpack_pack_inline_func_fastint
+#undef msgpack_pack_inline_func_fixint
 #endif
 
 
@@ -690,11 +690,11 @@ msgpack_pack_inline_func(_array)(msgpack_pack_user x, unsigned int n)
 		msgpack_pack_append_buffer(x, &d, 1);
 	} else if(n < 65536) {
 		unsigned char buf[3];
-		buf[0] = 0xdc; _msgpack_store16(&buf[1], n);
+		buf[0] = 0xdc; _msgpack_store16(&buf[1], (uint16_t)n);
 		msgpack_pack_append_buffer(x, buf, 3);
 	} else {
 		unsigned char buf[5];
-		buf[0] = 0xdd; _msgpack_store32(&buf[1], n);
+		buf[0] = 0xdd; _msgpack_store32(&buf[1], (uint32_t)n);
 		msgpack_pack_append_buffer(x, buf, 5);
 	}
 }
@@ -711,11 +711,11 @@ msgpack_pack_inline_func(_map)(msgpack_pack_user x, unsigned int n)
 		msgpack_pack_append_buffer(x, &TAKE8_8(d), 1);
 	} else if(n < 65536) {
 		unsigned char buf[3];
-		buf[0] = 0xde; _msgpack_store16(&buf[1], n);
+		buf[0] = 0xde; _msgpack_store16(&buf[1], (uint16_t)n);
 		msgpack_pack_append_buffer(x, buf, 3);
 	} else {
 		unsigned char buf[5];
-		buf[0] = 0xdf; _msgpack_store32(&buf[1], n);
+		buf[0] = 0xdf; _msgpack_store32(&buf[1], (uint32_t)n);
 		msgpack_pack_append_buffer(x, buf, 5);
 	}
 }
@@ -732,11 +732,11 @@ msgpack_pack_inline_func(_raw)(msgpack_pack_user x, size_t l)
 		msgpack_pack_append_buffer(x, &TAKE8_8(d), 1);
 	} else if(l < 65536) {
 		unsigned char buf[3];
-		buf[0] = 0xda; _msgpack_store16(&buf[1], l);
+		buf[0] = 0xda; _msgpack_store16(&buf[1], (uint16_t)l);
 		msgpack_pack_append_buffer(x, buf, 3);
 	} else {
 		unsigned char buf[5];
-		buf[0] = 0xdb; _msgpack_store32(&buf[1], l);
+		buf[0] = 0xdb; _msgpack_store32(&buf[1], (uint32_t)l);
 		msgpack_pack_append_buffer(x, buf, 5);
 	}
 }

data/msgpack/sysdep.h

@@ -18,8 +18,9 @@
 #ifndef MSGPACK_SYSDEP_H__
 #define MSGPACK_SYSDEP_H__
 
-
-#ifdef _MSC_VER
+#include <stdlib.h>
+#include <stddef.h>
+#if defined(_MSC_VER) && _MSC_VER < 1600
 typedef __int8 int8_t;
 typedef unsigned __int8 uint8_t;
 typedef __int16 int16_t;
@@ -28,8 +29,9 @@ typedef __int32 int32_t;
 typedef unsigned __int32 uint32_t;
 typedef __int64 int64_t;
 typedef unsigned __int64 uint64_t;
+#elif defined(_MSC_VER)  // && _MSC_VER >= 1600
+#include <stdint.h>
 #else
-#include <stddef.h>
 #include <stdint.h>
 #include <stdbool.h>
 #endif
@@ -76,7 +78,7 @@ typedef unsigned int _msgpack_atomic_counter_t;
 #define _msgpack_be16(x) ntohs(x)
 #define _msgpack_be32(x) ntohl(x)
 
-#if defined(_byteswap_uint64)
+#if defined(_byteswap_uint64) || _MSC_VER >= 1400
 #  define _msgpack_be64(x) (_byteswap_uint64(x))
 #elif defined(bswap_64)
 #  define _msgpack_be64(x) bswap_64(x)

data/test/test_cases.rbc

@@ -0,0 +1,1152 @@
+!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